diff options
Diffstat (limited to 'locale/xlocale.c')
| -rw-r--r-- | locale/xlocale.c | 57 |
1 files changed, 36 insertions, 21 deletions
diff --git a/locale/xlocale.c b/locale/xlocale.c index 79ec548473..daea563ff1 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 |