From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 7 Jan 2012 15:39:03 +0000 (-0500)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.16-tps~1122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbb68a84ee16345203f896f29b93e92a52582201;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

fbb68a84ee16345203f896f29b93e92a52582201
diff --cc ChangeLog
index cafa830c11f,da900aa6000..8f9558c5655
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,10 +1,19 @@@
 +2012-01-07  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* elf/tst-unique3.cc: Add explicit declaration of gets.
 +	* elf/tst-unique3lib.cc: Likewise.
 +	* elf/tst-unique3lib2.cc: Likewise.
 +	* elf/tst-unique4.cc: Likewise.
 +
 +	* string/test-strcpy.c (do_one_test): Fix format string for WIDE use.
 +
+ 2012-01-06  Joseph Myers  <joseph@codesourcery.com>
+ 
+ 	[BZ #13566]
+ 	* assert/assert.h (static_assert): Don't define for C++.
+ 	* libio/stdio.h (gets): Do declare for C++ <= C++11.
+ 	* wcsmbs/uchar.h (char16_t, char32_t): Don't typedef for C++11.
+ 
  2012-01-03  Ulrich Drepper  <drepper@gmail.com>
  
  	* iconv/loop.c (single loop): Fix assertion in storing of