diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-22 02:42:47 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-22 02:42:47 +0000 |
| commit | a6624c7cb7f47281f01834c00d31322dfe9b16f2 (patch) | |
| tree | 8f9619816ca742397dc8ef00048607184c980a96 /libc/stdlib/stdlib.c | |
| parent | 7eac2221e41a367288359189d4bc557ae367c01a (diff) | |
| download | uClibc-alpine-a6624c7cb7f47281f01834c00d31322dfe9b16f2.tar.bz2 uClibc-alpine-a6624c7cb7f47281f01834c00d31322dfe9b16f2.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/stdlib/stdlib.c')
| -rw-r--r-- | libc/stdlib/stdlib.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index f9ec75555..ccd3c015d 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -102,9 +102,6 @@ #ifdef __UCLIBC_HAS_XLOCALE__ #include <xlocale.h> #endif /* __UCLIBC_HAS_XLOCALE__ */ -#ifdef __UCLIBC_HAS_LOCALE__ -libc_hidden_proto(__global_locale) -#endif /* TODO: clean up the following... */ @@ -505,7 +502,7 @@ unsigned long attribute_hidden _stdlib_strto_l(register const Wchar * __restrict #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif @@ -655,7 +652,7 @@ unsigned long long attribute_hidden _stdlib_strto_ll(register const Wchar * __re #else /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */ -#ifndef __UCLIBC_HAS_XLOCALE__ +#if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif /* This is the main work fuction which handles both strtoll (sflag = 1) and |