diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-01-21 02:52:59 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-01-21 02:52:59 +0000 |
| commit | 3f1adc3da04a7809171c3990770d72f28c5d80e4 (patch) | |
| tree | 0953b7f1ad2a4a72a3843ab34cc6b292e6d74ea5 /libc/misc/wctype | |
| parent | 71486075e0ab506b80609416a3126a666b88e415 (diff) | |
*: 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
Diffstat (limited to 'libc/misc/wctype')
| -rw-r--r-- | libc/misc/wctype/_wctype.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c index c6f536d91..0f3201d49 100644 --- a/libc/misc/wctype/_wctype.c +++ b/libc/misc/wctype/_wctype.c @@ -123,12 +123,12 @@ enum { #endif #endif /* __UCLIBC_MJN3_ONLY__ */ -#define ENCODING ((__UCLIBC_CURLOCALE_DATA).encoding) +#define ENCODING (__UCLIBC_CURLOCALE->encoding) -#define WCctype ((__UCLIBC_CURLOCALE_DATA).tblwctype) -#define WCuplow ((__UCLIBC_CURLOCALE_DATA).tblwuplow) -#define WCcmob ((__UCLIBC_CURLOCALE_DATA).tblwcomb) -#define WCuplow_diff ((__UCLIBC_CURLOCALE_DATA).tblwuplow_diff) +#define WCctype (__UCLIBC_CURLOCALE->tblwctype) +#define WCuplow (__UCLIBC_CURLOCALE->tblwuplow) +#define WCcmob (__UCLIBC_CURLOCALE->tblwcomb) +#define WCuplow_diff (__UCLIBC_CURLOCALE->tblwuplow_diff) #define WC_TABLE_DOMAIN_MAX __LOCALE_DATA_WC_TABLE_DOMAIN_MAX @@ -256,9 +256,7 @@ ISW_FUNC_BODY(xdigit); #define TOWLOWER(w) towlower(w) #else /* L_towlower */ #define TOWLOWER(w) towlower_l(w, __locale_t locale) -#undef __UCLIBC_CURLOCALE_DATA #undef __UCLIBC_CURLOCALE -#define __UCLIBC_CURLOCALE_DATA (*locale) #define __UCLIBC_CURLOCALE (locale) #endif /* L_towlower */ @@ -363,9 +361,7 @@ libc_hidden_def(towlower) #define TOWUPPER(w) towupper(w) #else /* L_towupper */ #define TOWUPPER(w) towupper_l(w, __locale_t locale) -#undef __UCLIBC_CURLOCALE_DATA #undef __UCLIBC_CURLOCALE -#define __UCLIBC_CURLOCALE_DATA (*locale) #define __UCLIBC_CURLOCALE (locale) #endif /* L_towupper */ @@ -619,9 +615,7 @@ int iswctype(wint_t wc, wctype_t desc) #define ISWCTYPE(w,d) iswctype(w,d) #else /* L_iswctype */ #define ISWCTYPE(w,d) iswctype_l(w,d, __locale_t locale) -#undef __UCLIBC_CURLOCALE_DATA #undef __UCLIBC_CURLOCALE -#define __UCLIBC_CURLOCALE_DATA (*locale) #define __UCLIBC_CURLOCALE (locale) #endif /* L_iswctype */ @@ -668,7 +662,7 @@ int ISWCTYPE(wint_t wc, wctype_t desc) <= ctype_range[2*desc + 1] ) && ((desc != _CTYPE_iswblank) || (d & 1)); #else - return (__UCLIBC_CURLOCALE_DATA).code2flag[d] & desc2flag[desc]; + return __UCLIBC_CURLOCALE->code2flag[d] & desc2flag[desc]; #endif } @@ -728,9 +722,7 @@ wint_t towctrans(wint_t wc, wctrans_t desc) #define TOWCTRANS(w,d) towctrans(w,d) #else /* L_towctrans */ #define TOWCTRANS(w,d) towctrans_l(w,d, __locale_t locale) -#undef __UCLIBC_CURLOCALE_DATA #undef __UCLIBC_CURLOCALE -#define __UCLIBC_CURLOCALE_DATA (*locale) #define __UCLIBC_CURLOCALE (locale) #endif /* L_towctrans */ |