diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2001-10-01 22:05:11 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2001-10-01 22:05:11 +0400 |
| commit | 5665b0e1d06cf7df8403ff287c8d400ebd368c65 (patch) | |
| tree | 52ee68be2e527a08d1608deeeddeec5fd0bf9f76 /newlib/libc/stdio | |
| parent | 47063f00e4eae2ed37096eda54429c025c0bc7b5 (diff) | |
2001-10-01 Charles Wilson <cwilson@ece.gatech.edu>
* libc/include/stdlib.h: add declarations for
_strtoull_r, _strtoll_r, strtoull, and strtoll.
* libc/stdio/local.h: remove declarations of
__strtoull_r and __strtoll_r.
* libc/stdio/vfscanf.c(__svfscanf_r): call
_strtoull_r instead of __strtoull_r. Ditto
_strtoll_r vs. __strtoll_r.
* libc/stdlib/Makefile.am: add new files to
.c list and .def list
* libc/stdlib/Makefile.in: regenerate
* libc/stdlib/strtoll_r.c: rename __strtoll_r
as _strtoll_r
* libc/stdlib/strtoull_r.c: rename __strtoull_r
as _strtoull_r
* libc/stdlib/strtoull.c: new file
* libc/stdlib/strtoll.c: new file
Diffstat (limited to 'newlib/libc/stdio')
| -rw-r--r-- | newlib/libc/stdio/local.h | 6 | ||||
| -rw-r--r-- | newlib/libc/stdio/vfscanf.c | 4 |
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; } |