diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-01-21 02:53:20 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-01-21 02:53:20 +0000 |
| commit | 3035e493dbe63730c51a5042e18ab3b8c1232006 (patch) | |
| tree | fe14548324d60664b92903978a7a74be84d07ef7 /libc/stdlib/stdlib.c | |
| parent | 8458d69e57fed84caa2d8d672f687149e04c67f4 (diff) | |
| download | uClibc-alpine-3035e493dbe63730c51a5042e18ab3b8c1232006.tar.bz2 uClibc-alpine-3035e493dbe63730c51a5042e18ab3b8c1232006.tar.xz | |
*: 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/stdlib/stdlib.c')
| -rw-r--r-- | libc/stdlib/stdlib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index 7202182d9..ef92ea4fd 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -114,7 +114,7 @@ #ifdef __UCLIBC_HAS_LOCALE__ -#define ENCODING ((__UCLIBC_CURLOCALE_DATA).encoding) +#define ENCODING (__UCLIBC_CURLOCALE->encoding) #ifndef __CTYPE_HAS_UTF_8_LOCALES #ifdef L_mblen /* emit only once */ @@ -916,7 +916,7 @@ void ssort(void *base, size_t _stdlib_mb_cur_max(void) { #ifdef __CTYPE_HAS_UTF_8_LOCALES - return __UCLIBC_CURLOCALE_DATA.mb_cur_max; + return __UCLIBC_CURLOCALE->mb_cur_max; #else #ifdef __CTYPE_HAS_8_BIT_LOCALES #ifdef __UCLIBC_MJN3_ONLY__ |