From b25ad630be8b0f362fea44a97efbead83d1dd2ae Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Mon, 16 Jan 2006 18:07:18 +0000 Subject: Last relocs jump and global data, (even locales) that I could remove are gone from libc. The remaining are left as exercise for others ;-) --- libc/misc/locale/locale.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'libc/misc/locale') diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c index c32d09722..690e61398 100644 --- a/libc/misc/locale/locale.c +++ b/libc/misc/locale/locale.c @@ -70,6 +70,7 @@ libc_hidden_proto(strcpy) libc_hidden_proto(strncmp) libc_hidden_proto(strchr) libc_hidden_proto(getenv) +libc_hidden_proto(__C_ctype_toupper) /*libc_hidden_proto(fflush)*/ #ifdef __UCLIBC_MJN3_ONLY__ @@ -149,6 +150,10 @@ extern void _locale_init_l(__locale_t base) attribute_hidden; #include #include +#ifdef __UCLIBC_HAS_LOCALE__ +libc_hidden_proto(__global_locale) +#endif + /**********************************************************************/ #ifdef L_setlocale @@ -359,12 +364,23 @@ struct lconv *localeconv(void) /**********************************************************************/ #if defined(L__locale_init) && !defined(__LOCALE_C_ONLY) +libc_hidden_proto(__C_ctype_b) +libc_hidden_proto(__C_ctype_tolower) +#ifndef __UCLIBC_HAS_XLOCALE__ +libc_hidden_proto(__ctype_b) +libc_hidden_proto(__ctype_tolower) +libc_hidden_proto(__ctype_toupper) +#endif + __uclibc_locale_t __global_locale_data; __locale_t __global_locale = &__global_locale_data; +libc_hidden_def(__global_locale) #ifdef __UCLIBC_HAS_XLOCALE__ +libc_hidden_proto(__curlocale_var) __locale_t __curlocale_var = &__global_locale_data; +libc_hidden_def(__curlocale_var) #endif /*----------------------------------------------------------------------*/ @@ -1367,8 +1383,9 @@ void freelocale(__locale_t dataset) /**********************************************************************/ #ifdef L_uselocale -libc_hidden_proto(uselocale) +libc_hidden_proto(__curlocale_var) +libc_hidden_proto(uselocale) __locale_t uselocale(__locale_t dataset) { __locale_t old; @@ -1400,6 +1417,8 @@ libc_hidden_def(uselocale) #ifdef __UCLIBC_HAS_THREADS__ +libc_hidden_proto(__curlocale_var) + __locale_t weak_const_function __curlocale(void) { return __curlocale_var; /* This is overriden by the thread version. */ -- cgit v1.2.3