[Commits] r16670 - in /fsf/trunk/libc: ChangeLog libio/bits/stdio2.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Jan 14 00:02:07 2012
New Revision: 16670

Log:
Import glibc-mainline for 2012-01-14

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/libio/bits/stdio2.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Jan 14 00:02:07 2012
@@ -1,3 +1,8 @@
+2012-01-12  Marek Polacek  <polacek@xxxxxxxxxx>
+
+	* libio/bits/stdio2.h: Do not define gets for ISO C11, ISO C++11,
+	and _GNU_SOURCE.
+
 2012-01-04  Will Schmidt  <will_schmidt@xxxxxxxxxxxx>
 
 	* powerpc/powerpc32/sysdep.h: Add GLUE and GENERATE_GOT_LABEL macros.

Modified: fsf/trunk/libc/libio/bits/stdio2.h
==============================================================================
--- fsf/trunk/libc/libio/bits/stdio2.h (original)
+++ fsf/trunk/libc/libio/bits/stdio2.h Sat Jan 14 00:02:07 2012
@@ -217,6 +217,8 @@
 
 #endif
 
+#if !defined __USE_ISOC11 \
+    || (defined __cplusplus && __cplusplus <= 201103L && !defined __USE_GNU)
 extern char *__gets_chk (char *__str, size_t) __wur;
 extern char *__REDIRECT (__gets_warn, (char *__str), gets)
      __wur __warnattr ("please use fgets or getline instead, gets can't "
@@ -229,6 +231,7 @@
     return __gets_chk (__str, __bos (__str));
   return __gets_warn (__str);
 }
+#endif
 
 extern char *__fgets_chk (char *__restrict __s, size_t __size, int __n,
 			  FILE *__restrict __stream) __wur;

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits