From 0b63ccd01d3fa913bd28a0478f8917071153995a Mon Sep 17 00:00:00 2001 From: Aditya Upadhyay Date: Thu, 27 Jul 2017 02:34:29 +0530 Subject: [PATCH v2 3/4] importing wcstoimax inttypes methods with fixed trailed l. --- newlib/libc/include/inttypes.h | 2 +- newlib/libc/stdlib/wcstoimax.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/include/inttypes.h index 6e94a5385..5ca0bfcd2 100644 --- a/newlib/libc/include/inttypes.h +++ b/newlib/libc/include/inttypes.h @@ -329,7 +329,7 @@ extern uintmax_t strtoumax_l(const char *__restrict, char **_restrict, int, loca 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); +extern intmax_t _wcstoimax_l(struct _reent *, const wchar_t *__restrict, wchar_t **__restrict, int, locale_t); extern intmax_t wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int); extern uintmax_t wcstoumax_l(const wchar_t *__restrict, wchar_t **_restrict, int, locale_t); extern uintmax_t _wcstoumax_r(struct _reent *, const wchar_t *__restrict, wchar_t **__restrict, int, locale_t); diff --git a/newlib/libc/stdlib/wcstoimax.c b/newlib/libc/stdlib/wcstoimax.c index 0994bcb94..dd350e6be 100644 --- a/newlib/libc/stdlib/wcstoimax.c +++ b/newlib/libc/stdlib/wcstoimax.c @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD: head/lib/libc/locale/wcstoimax.c 314436 2017-02-28 23:42:47Z *Reentrant version of wcstoimax. */ intmax_t -_wcstoimax_r(struct _reent *rptr, const wchar_t * __restrict nptr, +_wcstoimax_l(struct _reent *rptr, const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base, locale_t loc) { const wchar_t *s = nptr; @@ -136,10 +136,10 @@ intmax_t wcstoimax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base, locale_t loc) { - return _wcstoimax_r(_REENT, nptr, endptr, base, loc); + return _wcstoimax_l(_REENT, nptr, endptr, base, loc); } intmax_t wcstoimax(const wchar_t* __restrict nptr, wchar_t** __restrict endptr, int base) { - return _wcstoimax_r(_REENT, nptr, endptr, base, __get_current_locale()); + return _wcstoimax_l(_REENT, nptr, endptr, base, __get_current_locale()); } -- 2.13.0