From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 15 Oct 2011 20:28:27 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.15~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b25bd9303436af1de65afea4e984b640b2c81d;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

e9b25bd9303436af1de65afea4e984b640b2c81d
diff --cc ChangeLog
index a7080033015,d6760b9e137..3e71646be15
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,10 +1,20 @@@
 +2011-10-15  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* ctype/ctype-info.c (__ctype_init): Define.
 +	* include/ctype.h (__ctype_init): Declare.
 +	(__ctype_b_loc): The variable is always initialized.
 +	(__ctype_toupper_loc): Likewise.
 +	(__ctype_tolower_loc): Likewise.
 +	* ctype/Versions: Export __ctype_init for GLIBC_PRIVATE.
 +	* sysdeps/unix/sysv/linux/init-first.c (_init): Call __ctype_init.
 +
+ 2011-10-15  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+ 	* wcsmbs/wmemcmp.c (WMEMCMP): Define.
+ 
+ 	* configure.in: Also look in $cxxmachine/include for C++ system
+ 	headers.
+ 
  2011-09-27  Liubov Dmitrieva  <liubov.dmitrieva@gmail.com>
  
  	* sysdeps/x86_64/multiarch/Makefile: (sysdep_routines): Add