From 8e2e833ac4d6509b152d6b8d74d388725717c56f Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 10 Dec 2014 11:28:51 +0100 Subject: 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. --- string/string.h | 8 ++------ string/strings.h | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'string') 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 -/* 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 -/* 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 -- cgit 1.4.1