about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-03-09 22:08:39 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-03-09 22:08:39 +0000
commitc6e013c15e0091edc49affd6ce26562845000dcd (patch)
treefbd184fdbd62c6f09b69d351de0a23da69eb4619
parent4962050e9783502ec0465ae1b6a4103563385198 (diff)
downloadglibc-c6e013c15e0091edc49affd6ce26562845000dcd.tar.gz
glibc-c6e013c15e0091edc49affd6ce26562845000dcd.tar.xz
glibc-c6e013c15e0091edc49affd6ce26562845000dcd.zip
Always declare gets for C++ up to C++11 without checking __USE_GNU.
-rw-r--r--ChangeLog4
-rw-r--r--libio/stdio.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 79d9dc2665..d2e15f0a8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-09  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #13566]
+	* libio/stdio.h (gets): Always declare for C++ up to C++11 without
+	checking __USE_GNU.
+
 	* Makerules ($(inst_includedir)/%.h): New rule.
 	* stdio-common/Makefile (headers): Add bits/stdio_lim.h.
 	(install-others): Remove variable setting.
diff --git a/libio/stdio.h b/libio/stdio.h
index c69b382da1..9ca3ad3a28 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -623,7 +623,7 @@ extern char *fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
      __wur;
 
 #if !defined __USE_ISOC11 \
-    || (defined __cplusplus && __cplusplus <= 201103L && !defined __USE_GNU)
+    || (defined __cplusplus && __cplusplus <= 201103L)
 /* Get a newline-terminated string from stdin, removing the newline.
    DO NOT USE THIS FUNCTION!!  There is no limit on how much it will read.