aboutsummaryrefslogtreecommitdiff
path: root/locale/xlocale.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-04 01:41:55 +0000
committerRoland McGrath <roland@gnu.org>2002-08-04 01:41:55 +0000
commit30c14c31ae6ac7c8db692fc23d0901e4d479f7af (patch)
tree25e403cd215f6d2ca484ae20a51ae41019ce19db /locale/xlocale.c
parent509d1b68421a9dc02605540615d241b48bf90a13 (diff)
downloadglibc-30c14c31ae6ac7c8db692fc23d0901e4d479f7af.zip
glibc-30c14c31ae6ac7c8db692fc23d0901e4d479f7af.tar.gz
glibc-30c14c31ae6ac7c8db692fc23d0901e4d479f7af.tar.bz2
* locale/setlocale.c (_nl_current_names): Variable moved ...
* locale/localename.c (_nl_current_names): ... here, new file. Make it global, with attribute_hidden. * locale/localeinfo.h: Declare it. * locale/Makefile (aux): Add localename. * locale/localename.c (__current_locale_name): New function. * include/locale.h (__current_locale_name): Declare it. * intl/dcigettext.c (guess_category_value): Use that instead of calling setlocale. * locale/locale.h [__USE_GNU] (locale_t): New type alias of __locale_t. [__USE_GNU] (newlocale, duplocale, freelocale, uselocale): New decls. [__USE_GNU] (LC_GLOBAL_LOCALE): New macro. * locale/newlocale.c: Add alias to __ name. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/uselocale.c: New file. * locale/Makefile (routines): Add it. * locale/Versions (libc: GLIBC_2.3): New set. Add newlocale, duplocale, freelocale, uselocale. (libc: GLIBC_PRIVATE): Add __uselocale. * locale/localeinfo.h [SHARED] (_NL_CURRENT_LOCALE): New macro, defined to fetch a tsd value. (_NL_CURRENT_DATA): Define using that. (_NL_CURRENT, _NL_CURRENT_WSTR, _NL_CURRENT_WORD): Define using that. (_NL_CURRENT_DEFINE): Define to empty. [! SHARED]: Decls of _nl_current_CATEGORY and _nl_current conditionalized on this. * locale/xlocale.c (NL_C_INTIIALIZER): New macro, taking initializer of _nl_C_locobj. [SHARED] (_nl_global_locale): New variable, using that initializer. (_nl_C_locobj): Use new macro for initialzier. * locale/setlocale.c [! SHARED] (_nl_current): Conditionalize on this. [! SHARED] (CATEGORY_USED): New macro. [SHARED] (CATEGORY_USED, _nl_C): New macros. (setdata, setlocale): Use that macro instead of examining _nl_current. (setdata): Set the slot in _nl_global_locale. Conditionalize setting of _nl_current on [! SHARED]. * locale/findlocale.c [SHARED] (_nl_C): Define as a macro instead of declaration as an extern. * locale/newlocale.c (__newlocale): Use _nl_C_locobj instead of _nl_C. * include/locale.h: Use libc_hidden_proto for setlocale. * locale/setlocale.c: Add libc_hidden_def. * locale/setlocale.c (free_mem): Use _NL_CURRENT_DATA.
Diffstat (limited to 'locale/xlocale.c')
-rw-r--r--locale/xlocale.c57
1 files changed, 36 insertions, 21 deletions
diff --git a/locale/xlocale.c b/locale/xlocale.c
index 79ec548..daea563 100644
--- a/locale/xlocale.c
+++ b/locale/xlocale.c
@@ -32,24 +32,39 @@ extern const char _nl_C_LC_CTYPE_toupper[] attribute_hidden;
extern const char _nl_C_LC_CTYPE_tolower[] attribute_hidden;
-struct __locale_struct _nl_C_locobj attribute_hidden =
- {
- .__locales =
- {
- [LC_CTYPE] = &_nl_C_LC_CTYPE,
- [LC_NUMERIC] = &_nl_C_LC_NUMERIC,
- [LC_TIME] = &_nl_C_LC_TIME,
- [LC_COLLATE] = &_nl_C_LC_COLLATE,
- [LC_MONETARY] = &_nl_C_LC_MONETARY,
- [LC_MESSAGES] = &_nl_C_LC_MESSAGES,
- [LC_PAPER] = &_nl_C_LC_PAPER,
- [LC_NAME] = &_nl_C_LC_NAME,
- [LC_ADDRESS] = &_nl_C_LC_ADDRESS,
- [LC_TELEPHONE] = &_nl_C_LC_TELEPHONE,
- [LC_MEASUREMENT] = &_nl_C_LC_MEASUREMENT,
- [LC_IDENTIFICATION] = &_nl_C_LC_IDENTIFICATION
- },
- .__ctype_b = (const unsigned short int *) _nl_C_LC_CTYPE_class + 128,
- .__ctype_tolower = (const int *) _nl_C_LC_CTYPE_tolower + 128,
- .__ctype_toupper = (const int *) _nl_C_LC_CTYPE_toupper + 128
- };
+#define NL_C_INITIALIZER \
+ { \
+ .__locales = \
+ { \
+ [LC_CTYPE] = &_nl_C_LC_CTYPE, \
+ [LC_NUMERIC] = &_nl_C_LC_NUMERIC, \
+ [LC_TIME] = &_nl_C_LC_TIME, \
+ [LC_COLLATE] = &_nl_C_LC_COLLATE, \
+ [LC_MONETARY] = &_nl_C_LC_MONETARY, \
+ [LC_MESSAGES] = &_nl_C_LC_MESSAGES, \
+ [LC_PAPER] = &_nl_C_LC_PAPER, \
+ [LC_NAME] = &_nl_C_LC_NAME, \
+ [LC_ADDRESS] = &_nl_C_LC_ADDRESS, \
+ [LC_TELEPHONE] = &_nl_C_LC_TELEPHONE, \
+ [LC_MEASUREMENT] = &_nl_C_LC_MEASUREMENT, \
+ [LC_IDENTIFICATION] = &_nl_C_LC_IDENTIFICATION \
+ }, \
+ .__ctype_b = (const unsigned short int *) _nl_C_LC_CTYPE_class + 128, \
+ .__ctype_tolower = (const int *) _nl_C_LC_CTYPE_tolower + 128, \
+ .__ctype_toupper = (const int *) _nl_C_LC_CTYPE_toupper + 128 \
+ }
+
+struct __locale_struct _nl_C_locobj attribute_hidden = NL_C_INITIALIZER;
+
+#ifdef SHARED
+struct __locale_struct _nl_global_locale attribute_hidden = NL_C_INITIALIZER;
+
+# if USE_TLS && HAVE___THREAD
+/* The tsd macros don't permit an initializer. */
+__thread void *__libc_tsd_LOCALE = &_nl_global_locale;
+# else
+__libc_tsd_define (, LOCALE)
+void *__libc_tsd_LOCALE_data = &_nl_global_locale;
+# endif
+
+#endif