From: Ulrich Drepper <drepper@gmail.com>
Date: Tue, 31 Jan 2012 23:50:35 +0000 (-0500)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.16-tps~1038
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d029511d8832d0f97f83c820efc08f1f1a73bdd;p=thirdparty%2Fglibc.git

Merge branch 'master' of ssh://sourceware.org/git/glibc
---

9d029511d8832d0f97f83c820efc08f1f1a73bdd
diff --cc ChangeLog
index 34257625019,a87f1e658dd..929500cab96
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,19 +1,25 @@@
+ 2012-01-31  Joseph Myers  <joseph@codesourcery.com>
+ 
+ 	* sysdeps/powerpc/bits/mathdef.h (float_t): Always define as
+ 	float.
+ 	* sysdeps/sh/sh4/bits/mathdef.h: Likewise.
+ 	* sysdeps/sparc/bits/mathdef.h: Likewise.
+ 
+ 2012-01-31  Marek Polacek  <polacek@redhat.com>
+ 
+ 	* libio/libio.h: Don't define _PARAMS.
+ 	* locale/programs/config.h: Don't define PARAMS.
+ 	* stdlib/strtol_l.c: Likewise.
+ 	(__strtol_l): Remove PARAMS from the prototype.
+ 
  2012-01-31  Ulrich Drepper  <drepper@gmail.com>
  
 +	* malloc/malloc.c: Remove name translation.  Don't use mixed-cap
 +	names.  Just use the correct names.  Remove unnecessary wrapper
 +	functions.
 +	* malloc/arena.c: Likewise.
 +	* malloc/hooks.c: Likewise.
 +
  	* malloc/arena.c (arena_get2): Really don't call __get_nprocs if
  	ARENA_TEST says not to.  Simplify test for creation of a new arena.
  	Partially based on a patch by Siddhesh Poyarekar <siddhesh@redhat.com>.