diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-08-03 02:43:06 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-08-03 02:43:06 +0000 |
| commit | 9b2e9577b228350b15d88303b00097dd58e8d29b (patch) | |
| tree | 82493d0106a8f6de24685458f79cbf3b9525179c /include | |
| parent | 497af0cb21612530874e9471fb52f20d19c14026 (diff) | |
| download | glibc-9b2e9577b228350b15d88303b00097dd58e8d29b.tar.gz | |
* sysdeps/unix/dirstream.h (struct __dirstream): Move lock member
to fill a hole on 64-bit platforms.
* stdlib/stdlib.h: Remove __strto*_internal prototypes and strto*
inline functions.
* include/stdlib.h: Add __strto*_internal prototypes here.
* wcsmbs/wchar.h: Remove __wcsto*_internal prototypes and wcsto*
inline functions.
* include/wchar.h: Add __wcsto*_internal prototypes.
* sysdeps/generic/inttypes.h: No need to protect the declaration
of the __strto*_internal and __wcsto*_internal members here.
Diffstat (limited to 'include')
| -rw-r--r-- | include/stdlib.h | 45 | ||||
| -rw-r--r-- | include/wchar.h | 26 |
2 files changed, 64 insertions, 7 deletions
diff --git a/include/stdlib.h b/include/stdlib.h index 27111b8a85..d5c3751013 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -28,13 +28,6 @@ libc_hidden_proto (qsort) libc_hidden_proto (lrand48_r) libc_hidden_proto (wctomb) libc_hidden_proto (__secure_getenv) -libc_hidden_proto (__strtof_internal) -libc_hidden_proto (__strtod_internal) -libc_hidden_proto (__strtold_internal) -libc_hidden_proto (__strtol_internal) -libc_hidden_proto (__strtoll_internal) -libc_hidden_proto (__strtoul_internal) -libc_hidden_proto (__strtoull_internal) extern long int __random (void); extern void __srandom (unsigned int __seed); @@ -100,6 +93,44 @@ extern void *__libc_memalign (size_t alignment, size_t size) extern int __libc_system (const char *line); + +extern double __strtod_internal (__const char *__restrict __nptr, + char **__restrict __endptr, int __group) + __THROW __nonnull ((1)) __wur; +extern float __strtof_internal (__const char *__restrict __nptr, + char **__restrict __endptr, int __group) + __THROW __nonnull ((1)) __wur; +extern long double __strtold_internal (__const char *__restrict __nptr, + char **__restrict __endptr, + int __group) + __THROW __nonnull ((1)) __wur; +extern long int __strtol_internal (__const char *__restrict __nptr, + char **__restrict __endptr, + int __base, int __group) + __THROW __nonnull ((1)) __wur; +extern unsigned long int __strtoul_internal (__const char *__restrict __nptr, + char **__restrict __endptr, + int __base, int __group) + __THROW __nonnull ((1)) __wur; +__extension__ +extern long long int __strtoll_internal (__const char *__restrict __nptr, + char **__restrict __endptr, + int __base, int __group) + __THROW __nonnull ((1)) __wur; +__extension__ +extern unsigned long long int __strtoull_internal (__const char * + __restrict __nptr, + char **__restrict __endptr, + int __base, int __group) + __THROW __nonnull ((1)) __wur; +libc_hidden_proto (__strtof_internal) +libc_hidden_proto (__strtod_internal) +libc_hidden_proto (__strtold_internal) +libc_hidden_proto (__strtol_internal) +libc_hidden_proto (__strtoll_internal) +libc_hidden_proto (__strtoul_internal) +libc_hidden_proto (__strtoull_internal) + extern double ____strtod_l_internal (__const char *__restrict __nptr, char **__restrict __endptr, int __group, __locale_t __loc); diff --git a/include/wchar.h b/include/wchar.h index 89e9a4f81e..b3cf373d9e 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -18,6 +18,32 @@ extern __typeof (wcsftime_l) __wcsftime_l; libc_hidden_proto (__wcsftime_l) +extern double __wcstod_internal (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __group) + __THROW; +extern float __wcstof_internal (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __group) + __THROW; +extern long double __wcstold_internal (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __group) __THROW; +extern long int __wcstol_internal (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __base, int __group) __THROW; +extern unsigned long int __wcstoul_internal (__const wchar_t *__restrict __npt, + wchar_t **__restrict __endptr, + int __base, int __group) __THROW; +__extension__ +extern long long int __wcstoll_internal (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __base, int __group) __THROW; +__extension__ +extern unsigned long long int __wcstoull_internal (__const wchar_t * + __restrict __nptr, + wchar_t ** + __restrict __endptr, + int __base, + int __group) __THROW; libc_hidden_proto (__wcstof_internal) libc_hidden_proto (__wcstod_internal) libc_hidden_proto (__wcstold_internal) |