summary refs log tree commit diff
path: root/string
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 /string
parent85b290451e4d3ab460a57f1c5966c5827ca807ca (diff)
downloadglibc-8e2e833ac4d6509b152d6b8d74d388725717c56f.tar.gz
glibc-8e2e833ac4d6509b152d6b8d74d388725717c56f.tar.xz
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.
Diffstat (limited to 'string')
-rw-r--r--string/string.h8
-rw-r--r--string/strings.h8
2 files changed, 4 insertions, 12 deletions
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