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/misc/ctype/ctype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libc/misc/ctype') diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c index 8d20a39cf..a98d345d8 100644 --- a/libc/misc/ctype/ctype.c +++ b/libc/misc/ctype/ctype.c @@ -433,7 +433,7 @@ int isctype(int c, int mask) const __ctype_mask_t **__ctype_b_loc(void) { - return &(__UCLIBC_CURLOCALE_DATA).__ctype_b; + return &(__UCLIBC_CURLOCALE->__ctype_b); } libc_hidden_def(__ctype_b_loc) @@ -448,7 +448,7 @@ libc_hidden_def(__ctype_b_loc) /* libc_hidden_proto(__ctype_tolower_loc) */ const __ctype_touplow_t **__ctype_tolower_loc(void) { - return &(__UCLIBC_CURLOCALE_DATA).__ctype_tolower; + return &(__UCLIBC_CURLOCALE->__ctype_tolower); } libc_hidden_def(__ctype_tolower_loc) @@ -463,7 +463,7 @@ libc_hidden_def(__ctype_tolower_loc) /* libc_hidden_proto(__ctype_toupper_loc) */ const __ctype_touplow_t **__ctype_toupper_loc(void) { - return &(__UCLIBC_CURLOCALE_DATA).__ctype_toupper; + return &(__UCLIBC_CURLOCALE->__ctype_toupper); } libc_hidden_def(__ctype_toupper_loc) -- cgit v1.2.3