From patchwork Wed Dec 10 10:36:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 4135 Received: (qmail 10620 invoked by alias); 10 Dec 2014 10:36:17 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 10611 invoked by uid 89); 10 Dec 2014 10:36:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx2.suse.de From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Don't define __CORRECT_ISO_CPP_STRING_H_PROTO for non-GCC compilers X-Yow: KARL MALDEN'S NOSE just won an ACADEMY AWARD!! Date: Wed, 10 Dec 2014 11:36:12 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) MIME-Version: 1.0 The implementation of __CORRECT_ISO_CPP_STRING_H_PROTO requires support for asm aliases, which isn't C++98. [BZ #17631] * string/string.h (__CORRECT_ISO_CPP_STRING_H_PROTO): Don't define for for non-GCC compilers. * string/strings.h (__CORRECT_ISO_CPP_STRINGS_H_PROTO): Likewise. --- string/string.h | 8 ++------ string/strings.h | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/string/string.h b/string/string.h index c79debc..282a395 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 872a0b2..6d32929 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