From e0eda0ce0df697d51443d916f947b9a576753705 Mon Sep 17 00:00:00 2001 From: Aditya Upadhyay Date: Thu, 27 Jul 2017 02:33:38 +0530 Subject: [PATCH v2 2/4] importing strtoumax inttypes methods with fixed trailed l. --- newlib/libc/include/inttypes.h | 2 +- newlib/libc/stdlib/strtoumax.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/include/inttypes.h index cabcefbec..6e94a5385 100644 --- a/newlib/libc/include/inttypes.h +++ b/newlib/libc/include/inttypes.h @@ -326,7 +326,7 @@ extern intmax_t strtoimax_l(const char *__restrict, char **_restrict, int, loca extern intmax_t _strtoimax_l(struct _reent *, const char *__restrict, char **__restrict, int, locale_t); extern intmax_t strtoimax(const char *__restrict, char **__restrict, int); extern uintmax_t strtoumax_l(const char *__restrict, char **_restrict, int, locale_t); -extern uintmax_t _strtoumax_r(struct _reent *, const char *__restrict, char **__restrict, int, locale_t); +extern uintmax_t _strtoumax_l(struct _reent *, const char *__restrict, char **__restrict, int, locale_t); extern uintmax_t strtoumax(const char *__restrict, char **__restrict, int); extern intmax_t wcstoimax_l(const wchar_t *__restrict, wchar_t **_restrict, int, locale_t); extern intmax_t _wcstoimax_r(struct _reent *, const wchar_t *__restrict, wchar_t **__restrict, int, locale_t); diff --git a/newlib/libc/stdlib/strtoumax.c b/newlib/libc/stdlib/strtoumax.c index 240a6afed..b2426a580 100644 --- a/newlib/libc/stdlib/strtoumax.c +++ b/newlib/libc/stdlib/strtoumax.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib/strtoumax.c 251672 2013-06-13 00:19:30Z *Reentrant version of strtoumax. */ uintmax_t -_strtoumax_r(struct _reent *rptr, const char * __restrict nptr, +_strtoumax_l(struct _reent *rptr, const char * __restrict nptr, char ** __restrict endptr, int base, locale_t loc) { const char *s = (const unsigned char *)nptr; @@ -129,10 +129,10 @@ uintmax_t strtoumax_l(const char * __restrict nptr, char ** __restrict endptr, int base, locale_t loc) { - return _strtoumax_r(_REENT, nptr, endptr, base, loc); + return _strtoumax_l(_REENT, nptr, endptr, base, loc); } uintmax_t strtoumax(const char* __restrict nptr, char** __restrict endptr, int base) { - return _strtoumax_r(_REENT, nptr, endptr, base, __get_current_locale()); + return _strtoumax_l(_REENT, nptr, endptr, base, __get_current_locale()); } -- 2.13.0