[commits] r11098 - in /fsf/trunk/libc: ChangeLog NEWS manual/locale.texi

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Jul 30 00:03:14 2010
New Revision: 11098

Log:
Import glibc-mainline for 2010-07-30

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/manual/locale.texi

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Jul 30 00:03:14 2010
@@ -1,3 +1,8 @@
+2010-07-29  Roland McGrath  <roland@xxxxxxxxxx>
+
+	[BZ #11856]
+	* manual/locale.texi (Yes-or-No Questions): Fix example code.
+
 2010-07-27  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/x86_64/multiarch/strcmp-ssse3.S: Avoid compiling the file

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Fri Jul 30 00:03:14 2010
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2010-7-26
+GNU C Library NEWS -- history of user-visible changes.  2010-7-29
 Copyright (C) 1992-2009, 2010 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -9,7 +9,7 @@
 
 * The following bugs are resolved with this release:
 
-  11640, 11701, 11840
+  11640, 11701, 11840, 11856
 
 * POWER7 optimizations: memset, memcmp, strncmp
 

Modified: fsf/trunk/libc/manual/locale.texi
==============================================================================
--- fsf/trunk/libc/manual/locale.texi (original)
+++ fsf/trunk/libc/manual/locale.texi Fri Jul 30 00:03:14 2010
@@ -1210,7 +1210,7 @@
   /* @r{Prepare the @code{getline} call.}  */
   line = NULL;
   len = 0;
-  while (getline (&line, &len, stdout) >= 0)
+  while (getline (&line, &len, stdin) >= 0)
     @{
       /* @r{Check the response.}  */
       int res = rpmatch (line);