From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH] stdlib: Reduce namespace pollution in <inttypes.h>
Date: Mon, 17 Feb 2020 11:56:57 +0100 [thread overview]
Message-ID: <877e0lscqu.fsf@oldenburg2.str.redhat.com> (raw)
This results in conform test failures if the tests are run
__USE_EXTERN_INLINES defined (e.g., when configuring with CC="gcc -O3"
CXX="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 *__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,
- int base))
+__NTH (strtoimax (const char *__restrict __nptr, char **__restrict __endptr,
+ int __base))
{
- return __strtol_internal (nptr, endptr, base, 0);
+ return __strtol_internal (__nptr, __endptr, __base, 0);
}
extern unsigned long int __strtoul_internal (const char *__restrict __nptr,
@@ -333,10 +333,10 @@ extern unsigned long int __strtoul_internal (const char *__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,
- int base))
+__NTH (strtoumax (const char *__restrict __nptr, char **__restrict __endptr,
+ int __base))
{
- return __strtoul_internal (nptr, endptr, base, 0);
+ return __strtoul_internal (__nptr, __endptr, __base, 0);
}
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,
- __gwchar_t **__restrict endptr, int base))
+__NTH (wcstoimax (const __gwchar_t *__restrict __nptr,
+ __gwchar_t **__restrict __endptr, int __base))
{
- return __wcstol_internal (nptr, endptr, base, 0);
+ return __wcstol_internal (__nptr, __endptr, __base, 0);
}
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,
- __gwchar_t **__restrict endptr, int base))
+__NTH (wcstoumax (const __gwchar_t *__restrict __nptr,
+ __gwchar_t **__restrict __endptr, int __base))
{
- return __wcstoul_internal (nptr, endptr, base, 0);
+ return __wcstoul_internal (__nptr, __endptr, __base, 0);
}
# else /* __WORDSIZE == 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,
- int base))
+__NTH (strtoimax (const char *__restrict __nptr, char **__restrict __endptr,
+ int __base))
{
- return __strtoll_internal (nptr, endptr, base, 0);
+ return __strtoll_internal (__nptr, __endptr, __base, 0);
}
__extension__
@@ -390,10 +390,10 @@ extern unsigned long long int __strtoull_internal (const 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,
- int base))
+__NTH (strtoumax (const char *__restrict __nptr, char **__restrict __endptr,
+ int __base))
{
- return __strtoull_internal (nptr, endptr, base, 0);
+ return __strtoull_internal (__nptr, __endptr, __base, 0);
}
__extension__
@@ -403,10 +403,10 @@ extern long long int __wcstoll_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,
- __gwchar_t **__restrict endptr, int base))
+__NTH (wcstoimax (const __gwchar_t *__restrict __nptr,
+ __gwchar_t **__restrict __endptr, int __base))
{
- return __wcstoll_internal (nptr, endptr, base, 0);
+ return __wcstoll_internal (__nptr, __endptr, __base, 0);
}
@@ -420,10 +420,10 @@ extern unsigned long long int __wcstoull_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,
- __gwchar_t **__restrict endptr, int base))
+__NTH (wcstoumax (const __gwchar_t *__restrict __nptr,
+ __gwchar_t **__restrict __endptr, int __base))
{
- return __wcstoull_internal (nptr, endptr, base, 0);
+ return __wcstoull_internal (__nptr, __endptr, __base, 0);
}
# endif /* __WORDSIZE == 32 */
next reply other threads:[~2020-02-17 10:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 10:56 Florian Weimer [this message]
2020-02-17 11:54 ` [PATCH] stdlib: Reduce namespace pollution in <inttypes.h> Andreas Schwab
2020-02-17 11:56 ` Florian Weimer
2020-02-17 18:35 ` Paul Eggert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877e0lscqu.fsf@oldenburg2.str.redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).