From: Ulrich Drepper <drepper@gmail.com>
Date: Wed, 25 Jan 2012 00:29:39 +0000 (-0500)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.16-tps~1055
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=83cf1b9f0244a6c6b420de88f19d707f2c2e5247;p=glibc.git

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

Conflicts:
	ChangeLog
---

83cf1b9f0244a6c6b420de88f19d707f2c2e5247
diff --cc ChangeLog
index 1887ec29da,729ee7238a..ffd422435a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,22 +1,29 @@@
 +2012-01-24  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* include/stdio.h: Add C++ protection.  Add gets declarations and
 +	definitions.
 +	* debug/tst-chk1.c: Don't declare gets here.
 +	* stdio-common/tst-gets.c: Likewise.
 +
+ 2012-01-24  Joseph Myers  <joseph@codesourcery.com>
+ 
+ 	* posix/glob: Remove directory.
+ 
+ 2012-01-24  Joseph Myers  <joseph@codesourcery.com>
+ 
+ 	* wcsmbs/Makefile (tst-c16c32-1-ENV): Define.
+ 
+ 2012-01-22  Pino Toscano  <toscano.pino@tiscali.it>
+ 
+ 	* sysdeps/mach/hurd/socket.c (__socket): Return EAFNOSUPPORT instead
+ 	of the non-standard EPFNOSUPPORT.
+ 
+ 2011-12-26  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+ 
+ 	* sysdeps/mach/hurd/mmap.c (__mmap): When MAPADDR is nonzero, try
+ 	__vm_allocate and __vm_map with ANYWHERE set to 0 first, and try with
+ 	ANYWHERE set to 1 only on KERN_NO_SPACE error.
+ 
  2012-01-21  Ulrich Drepper  <drepper@gmail.com>
  
  	* wcsmbs/uchar.h: Test __STDC_VERSION__.