From cdbb1b0873d0f618c5ea3eda9582ce7cdccae596 Mon Sep 17 00:00:00 2001 From: Aditya Upadhyay Date: Wed, 19 Jul 2017 21:52:33 +0530 Subject: [PATCH v2 4/4] Importing strtoimax inttype method from FreeBSD. --- newlib/libc/stdlib/strtoimax.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/newlib/libc/stdlib/strtoimax.c b/newlib/libc/stdlib/strtoimax.c index 0cb6e2acc..3e38b850e 100644 --- a/newlib/libc/stdlib/strtoimax.c +++ b/newlib/libc/stdlib/strtoimax.c @@ -36,7 +36,7 @@ static char sccsid[] = "from @(#)strtol.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: head/lib/libc/stdlib/strtoimax.c 251672 2013-06-13 00:19:30Z emaste $"); #include #include @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); * alphabets and digits are each contiguous. */ intmax_t -strtoimax_l(struct _reent *rptr, const char * __restrict nptr, char ** __restrict endptr, int base, - locale_t loc) +_strtoimax_r(struct _reent *rptr, const char * __restrict nptr, + char ** __restrict endptr, int base, locale_t loc) { const char *s = (const unsigned char *)nptr; uintmax_t acc; @@ -140,7 +140,13 @@ noconv: return (acc); } intmax_t -strtoimax(const char * __restrict nptr, char ** __restrict endptr, int base) +strtoimax_l(const char * __restrict nptr, char ** __restrict endptr, int base, + locale_t loc) { - return strtoimax_l(_REENT, nptr, endptr, base, __get_current_locale ()); + return _strtoimax_r(_REENT, nptr, endptr, base, loc); } +intmax_t +strtoimax(const char* __restrict nptr, char** __restrict endptr, int base) +{ + return _strtoimax_r(_REENT,nptr,endptr, base, __get_current_locale()); +} -- 2.11.0