From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 870C01F45E for ; Mon, 17 Feb 2020 10:57:09 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=xOg SLH4eY+7Fy686pIns0ZYeVOtunEYZRboXjvm/O7Rka857GmlSN4IQ7ZtvQLttoYj tZFl+y1tDKLK+vrDeiU+qh8hO06/ZULETFBJT1T+8sCsdGyDg8SrDkzsrXaOKbK6 vn4I2zeaNWzeNpYjBz39jIcgTaTLCE2BOwLwdSoA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=dGjYsSz7z xRTAb6zhVXpQFJBbBg=; b=KHCRWN2xkho1yTnxNKSTQtRwpwHZKSEwW3ZNmQoa5 qD6gfhOLc4qTH9E8+qxypaOnTlKxhslbe6OHFHdUEJPyTUNQ75aatlRLNy17zONm qHZ7+vQDBpavvkTY5bMK5IUa/C8cje7fvyU+NJYKW9m2bpBRof34dRumku8kScSi DI= Received: (qmail 22279 invoked by alias); 17 Feb 2020 10:57:07 -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 Received: (qmail 22271 invoked by uid 89); 17 Feb 2020 10:57:06 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: us-smtp-delivery-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581937022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nbzx0Jh+SAt/B2OqkDD4G8xcqVnsxkGfTuuqW1a5BFQ=; b=bsG3ObNF8vqZPp0dvjs0UkEZI3oPouM68K6BueF28wn0LQb2eKwnsQXJzYX7e1PunoxnlY WWw7VqZk+rBf+qEnBiUWpHHfbEhwZWFtYtaNtt0OnvfyJceO50lmOO1Y+2U0uQkJgz1SXk 3JLtevHROvYTdbK1saD/7nFJU9EfySU= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] stdlib: Reduce namespace pollution in Date: Mon, 17 Feb 2020 11:56:57 +0100 Message-ID: <877e0lscqu.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: quoted-printable This results in conform test failures if the tests are run __USE_EXTERN_INLINES defined (e.g., when configuring with CC=3D"gcc -O3" CXX=3D"g++ -O3"). ----- stdlib/inttypes.h | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/stdlib/inttypes.h b/stdlib/inttypes.h index 685dfc1360..611a8b56c3 100644 --- a/stdlib/inttypes.h +++ b/stdlib/inttypes.h @@ -321,10 +321,10 @@ extern long int __strtol_internal (const char *__rest= rict __nptr, __THROW __nonnull ((1)) __wur; /* Like `strtol' but convert to `intmax_t'. */ __extern_inline intmax_t -__NTH (strtoimax (const char *__restrict nptr, char **__restrict endptr, -=09=09 int base)) +__NTH (strtoimax (const char *__restrict __nptr, char **__restrict __endpt= r, +=09=09 int __base)) { - return __strtol_internal (nptr, endptr, base, 0); + return __strtol_internal (__nptr, __endptr, __base, 0); } =20 extern unsigned long int __strtoul_internal (const char *__restrict __nptr= , @@ -333,10 +333,10 @@ extern unsigned long int __strtoul_internal (const ch= ar *__restrict __nptr, __THROW __nonnull ((1)) __wur; /* Like `strtoul' but convert to `uintmax_t'. */ __extern_inline uintmax_t -__NTH (strtoumax (const char *__restrict nptr, char **__restrict endptr, -=09=09 int base)) +__NTH (strtoumax (const char *__restrict __nptr, char **__restrict __endpt= r, +=09=09 int __base)) { - return __strtoul_internal (nptr, endptr, base, 0); + return __strtoul_internal (__nptr, __endptr, __base, 0); } =20 extern long int __wcstol_internal (const __gwchar_t * __restrict __nptr, @@ -345,10 +345,10 @@ extern long int __wcstol_internal (const __gwchar_t *= __restrict __nptr, __THROW __nonnull ((1)) __wur; /* Like `wcstol' but convert to `intmax_t'. */ __extern_inline intmax_t -__NTH (wcstoimax (const __gwchar_t *__restrict nptr, -=09=09 __gwchar_t **__restrict endptr, int base)) +__NTH (wcstoimax (const __gwchar_t *__restrict __nptr, +=09=09 __gwchar_t **__restrict __endptr, int __base)) { - return __wcstol_internal (nptr, endptr, base, 0); + return __wcstol_internal (__nptr, __endptr, __base, 0); } =20 extern unsigned long int __wcstoul_internal (const __gwchar_t * @@ -359,10 +359,10 @@ extern unsigned long int __wcstoul_internal (const __= gwchar_t * __THROW __nonnull ((1)) __wur; /* Like `wcstoul' but convert to `uintmax_t'. */ __extern_inline uintmax_t -__NTH (wcstoumax (const __gwchar_t *__restrict nptr, -=09=09 __gwchar_t **__restrict endptr, int base)) +__NTH (wcstoumax (const __gwchar_t *__restrict __nptr, +=09=09 __gwchar_t **__restrict __endptr, int __base)) { - return __wcstoul_internal (nptr, endptr, base, 0); + return __wcstoul_internal (__nptr, __endptr, __base, 0); } =20 # else /* __WORDSIZE =3D=3D 32 */ @@ -374,10 +374,10 @@ extern long long int __strtoll_internal (const char *= __restrict __nptr, __THROW __nonnull ((1)) __wur; /* Like `strtol' but convert to `intmax_t'. */ __extern_inline intmax_t -__NTH (strtoimax (const char *__restrict nptr, char **__restrict endptr, -=09=09 int base)) +__NTH (strtoimax (const char *__restrict __nptr, char **__restrict __endpt= r, +=09=09 int __base)) { - return __strtoll_internal (nptr, endptr, base, 0); + return __strtoll_internal (__nptr, __endptr, __base, 0); } =20 __extension__ @@ -390,10 +390,10 @@ extern unsigned long long int __strtoull_internal (co= nst char * __THROW __nonnull ((1)) __wur; /* Like `strtoul' but convert to `uintmax_t'. */ __extern_inline uintmax_t -__NTH (strtoumax (const char *__restrict nptr, char **__restrict endptr, -=09=09 int base)) +__NTH (strtoumax (const char *__restrict __nptr, char **__restrict __endpt= r, +=09=09 int __base)) { - return __strtoull_internal (nptr, endptr, base, 0); + return __strtoull_internal (__nptr, __endptr, __base, 0); } =20 __extension__ @@ -403,10 +403,10 @@ extern long long int __wcstoll_internal (const __gwch= ar_t *__restrict __nptr, __THROW __nonnull ((1)) __wur; /* Like `wcstol' but convert to `intmax_t'. */ __extern_inline intmax_t -__NTH (wcstoimax (const __gwchar_t *__restrict nptr, -=09=09 __gwchar_t **__restrict endptr, int base)) +__NTH (wcstoimax (const __gwchar_t *__restrict __nptr, +=09=09 __gwchar_t **__restrict __endptr, int __base)) { - return __wcstoll_internal (nptr, endptr, base, 0); + return __wcstoll_internal (__nptr, __endptr, __base, 0); } =20 =20 @@ -420,10 +420,10 @@ extern unsigned long long int __wcstoull_internal (co= nst __gwchar_t * __THROW __nonnull ((1)) __wur; /* Like `wcstoul' but convert to `uintmax_t'. */ __extern_inline uintmax_t -__NTH (wcstoumax (const __gwchar_t *__restrict nptr, -=09=09 __gwchar_t **__restrict endptr, int base)) +__NTH (wcstoumax (const __gwchar_t *__restrict __nptr, +=09=09 __gwchar_t **__restrict __endptr, int __base)) { - return __wcstoull_internal (nptr, endptr, base, 0); + return __wcstoull_internal (__nptr, __endptr, __base, 0); } =20 # endif=09/* __WORDSIZE =3D=3D 32=09*/