summaryrefslogtreecommitdiffstats
path: root/newlib/libc/stdio
diff options
context:
space:
mode:
Diffstat (limited to 'newlib/libc/stdio')
-rw-r--r--newlib/libc/stdio/local.h6
-rw-r--r--newlib/libc/stdio/vfscanf.c4
2 files changed, 2 insertions, 8 deletions
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index d8ae29d9f..8b55503c8 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -86,12 +86,6 @@ char *_EXFUN(_licvt,(char *, long, char));
char *_EXFUN(_llicvt,(char *, long long, char));
#endif
-/* The following are found in the stdlib directory, not here */
-#ifdef __GNUC__
-long long _EXFUN(__strtoll_r,(struct _reent *, const char *, char **, int));
-unsigned long long _EXFUN(__strtoull_r,(struct _reent *, const char *, char **, int));
-#endif
-
#define CVT_BUF_SIZE 128
#define NDYNAMIC 4 /* add four more whenever necessary */
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 313a6b85b..8f49141f1 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -822,9 +822,9 @@ __svfscanf_r (rptr, fp, fmt0, ap)
{
u_long_long resll;
if (ccfn == _strtoul_r)
- resll = __strtoull_r (rptr, buf, (char **) NULL, base);
+ resll = _strtoull_r (rptr, buf, (char **) NULL, base);
else
- resll = __strtoll_r (rptr, buf, (char **) NULL, base);
+ resll = _strtoll_r (rptr, buf, (char **) NULL, base);
llp = va_arg (ap, long long*);
*llp = resll;
}