From a6624c7cb7f47281f01834c00d31322dfe9b16f2 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Tue, 22 Aug 2006 02:42:47 +0000 Subject: Merge from trunk. --- libc/stdlib/stdlib.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libc/stdlib/stdlib.c') 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 #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 -- cgit v1.2.3