aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2014-12-10 11:28:51 +0100
committerAndreas Schwab <schwab@suse.de>2015-03-04 11:52:55 +0100
commit8e2e833ac4d6509b152d6b8d74d388725717c56f (patch)
treeca423009efc5031a6dbbe4b71bfd7159ad068c51
parent85b290451e4d3ab460a57f1c5966c5827ca807ca (diff)
downloadglibc-8e2e833ac4d6509b152d6b8d74d388725717c56f.tar
glibc-8e2e833ac4d6509b152d6b8d74d388725717c56f.tar.gz
glibc-8e2e833ac4d6509b152d6b8d74d388725717c56f.tar.bz2
glibc-8e2e833ac4d6509b152d6b8d74d388725717c56f.zip
Don't define __CORRECT_ISO_CPP_STRING_H_PROTO for non-GCC compilers (bug 17631)
The implementation of __CORRECT_ISO_CPP_STRING_H_PROTO requires support for asm aliases.
-rw-r--r--ChangeLog8
-rw-r--r--NEWS8
-rw-r--r--string/string.h8
-rw-r--r--string/strings.h8
4 files changed, 16 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index dbbb5b2f92..a5b8fb7a3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-04 Andreas Schwab <schwab@suse.de>
+
+ [BZ #17631]
+ * string/string.h (__CORRECT_ISO_CPP_STRING_H_PROTO): Don't define
+ for non-GCC compilers.
+ * string/strings.h (__CORRECT_ISO_CPP_STRINGS_H_PROTO):
+ Likewise.
+
2015-03-03 Adhemerval Zanellla <azanella@linux.vnet.ibm.com>
[BZ #17776]
diff --git a/NEWS b/NEWS
index 01c9f9eac5..1f98e58da2 100644
--- a/NEWS
+++ b/NEWS
@@ -10,10 +10,10 @@ Version 2.22
* The following bugs are resolved with this release:
4719, 13064, 14094, 14841, 15319, 15467, 15790, 15969, 16351, 16512,
- 16560, 16783, 17269, 17523, 17569, 17588, 17711, 17776, 17779, 17792,
- 17836, 17912, 17916, 17932, 17944, 17949, 17964, 17965, 17967, 17969,
- 17978, 17987, 17991, 17996, 17998, 17999, 18019, 18020, 18029, 18030,
- 18032, 18036, 18038, 18039, 18046, 18047.
+ 16560, 16783, 17269, 17523, 17569, 17588, 17631, 17711, 17776, 17779,
+ 17792, 17836, 17912, 17916, 17932, 17944, 17949, 17964, 17965, 17967,
+ 17969, 17978, 17987, 17991, 17996, 17998, 17999, 18019, 18020, 18029,
+ 18030, 18032, 18036, 18038, 18039, 18046, 18047.
* Character encoding and ctype tables were updated to Unicode 7.0.0, using
new generator scripts contributed by Pravin Satpute and Mike FABIAN (Red
diff --git a/string/string.h b/string/string.h
index f6520a92f0..54a4d39a53 100644
--- a/string/string.h
+++ b/string/string.h
@@ -31,12 +31,8 @@ __BEGIN_DECLS
#define __need_NULL
#include <stddef.h>
-/* Provide correct C++ prototypes, and indicate this to the caller. This
- requires a compatible C++ standard library. As a heuristic, we provide
- these when the compiler indicates full conformance with C++98 or later,
- and for older GCC versions that are known to provide a compatible
- libstdc++. */
-#if defined __cplusplus && (__cplusplus >= 199711L || __GNUC_PREREQ (4, 4))
+/* Tell the caller that we provide correct C++ prototypes. */
+#if defined __cplusplus && __GNUC_PREREQ (4, 4)
# define __CORRECT_ISO_CPP_STRING_H_PROTO
#endif
diff --git a/string/strings.h b/string/strings.h
index 2e5f8229e0..028361ac99 100644
--- a/string/strings.h
+++ b/string/strings.h
@@ -27,12 +27,8 @@
# define __need_size_t
# include <stddef.h>
-/* Provide correct C++ prototypes, and indicate this to the caller. This
- requires a compatible C++ standard library. As a heuristic, we provide
- these when the compiler indicates full conformance with C++98 or later,
- and for older GCC versions that are known to provide a compatible
- libstdc++. */
-# if defined __cplusplus && (__cplusplus >= 199711L || __GNUC_PREREQ (4, 4))
+/* Tell the caller that we provide correct C++ prototypes. */
+# if defined __cplusplus && __GNUC_PREREQ (4, 4)
# define __CORRECT_ISO_CPP_STRINGS_H_PROTO
# endif