about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2012-01-13 12:45:02 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-13 12:45:02 -0500
commite0a309cf2a59042718fa95f97c5c35da33e61650 (patch)
tree1a1b3d27b25ee01cc0aa56701c8e27fc0a775e49
parent929d11c7cf81f4b7cfabc1910a583e6fa5897fd5 (diff)
downloadglibc-e0a309cf2a59042718fa95f97c5c35da33e61650.tar.gz
glibc-e0a309cf2a59042718fa95f97c5c35da33e61650.tar.xz
glibc-e0a309cf2a59042718fa95f97c5c35da33e61650.zip
Don't always provide definition of gets checking version
-rw-r--r--ChangeLog5
-rw-r--r--libio/bits/stdio2.h3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c7cba4e8e8..00faba1ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-12  Marek Polacek  <polacek@redhat.com>
+
+	* libio/bits/stdio2.h: Do not define gets for ISO C11, ISO C++11,
+	and _GNU_SOURCE.
+
 2012-01-04  Will Schmidt  <will_schmidt@vnet.ibm.com>
 
 	* powerpc/powerpc32/sysdep.h: Add GLUE and GENERATE_GOT_LABEL macros.
diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h
index a4166f7555..cbccea7f3e 100644
--- a/libio/bits/stdio2.h
+++ b/libio/bits/stdio2.h
@@ -217,6 +217,8 @@ __NTH (obstack_vprintf (struct obstack *__restrict __obstack,
 
 #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 @@ gets (char *__str)
     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;