From 3f1adc3da04a7809171c3990770d72f28c5d80e4 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 21 Jan 2009 02:52:59 +0000 Subject: *: remove __UCLIBC_CURLOCALE_DATA, __UCLIBC_CURLOCALE_DATA.x is always equivalent to __UCLIBC_CURLOCALE->x. remove typedef __uclibc_locale_t, it used only in a few places, it is lees confusing to use struct __uclibc_locale_struct everywhere. xlocale.h: hide __global_locale back under _LIBC, bug 53 is wrong in claiming it should be exported. Also hide under _LIBC: extern __locale_t __curlocale_var; extern __locale_t __curlocale(void); extern __locale_t __curlocale_set(__locale_t newloc); # define __UCLIBC_CURLOCALE # define __XL_NPP(N) # define __LOCALE_PARAM # define __LOCALE_ARG # define __LOCALE_PTR --- libc/string/_collate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libc/string/_collate.c') diff --git a/libc/string/_collate.c b/libc/string/_collate.c index 3c53404ad..9cc9ed055 100644 --- a/libc/string/_collate.c +++ b/libc/string/_collate.c @@ -81,7 +81,7 @@ libc_hidden_def(wcsxfrm) #if 0 -#define CUR_COLLATE (&__UCLIBC_CURLOCALE_DATA.collate) +#define CUR_COLLATE (&__UCLIBC_CURLOCALE->collate) #else #define CUR_COLLATE (& __LOCALE_PTR->collate) #endif -- cgit v1.2.3