diff options
author | Roland McGrath <roland@gnu.org> | 2002-08-30 10:36:44 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2002-08-30 10:36:44 +0000 |
commit | 1ce8aaaedbf549702c607e8a944bcb06b2c37544 (patch) | |
tree | 76190020f59b42303fd7586536c5257634f6623c /locale/global-locale.c | |
parent | * locale/localename.c: If the current locale is the global locale, use (diff) | |
download | glibc-1ce8aaaedbf549702c607e8a944bcb06b2c37544.tar.gz glibc-1ce8aaaedbf549702c607e8a944bcb06b2c37544.tar.bz2 glibc-1ce8aaaedbf549702c607e8a944bcb06b2c37544.zip |
* locale/xlocale.h (struct __locale_struct): New member `__names'.
* locale/xlocale.c (_nl_C_locobj): Update initializer.
* locale/global-locale.c (_nl_global_locale): Likewise.
* locale/duplocale.c (__duplocale): strdup __names elements.
* locale/freelocale.c (__freelocale): Free __names elements.
* locale/localename.c (_nl_current_names): Variable removed.
(__current_locale_name): Use _NL_CURRENT_LOCALE->__names instead.
* locale/localeinfo.h (_nl_current_names): Removed decl.
* locale/setlocale.c: Use _nl_global_locale->__names in place of
_nl_current_names throughout.
* locale/setlocale.c (setlocale): strdup -> __strdup (not ISO C).
* sysdeps/gnu/errlist-compat.awk: Emit link_warnings for sys_errlist
and sys_nerr in the output file.
* sunrpc/Makefile (rpcgen-cmd): Pass CPP in rpcgen's environment.
* scripts/cpp: Just use the environment variable.
* libio/tst-mmap-setvbuf.c (main): Use 'm' fopen flag.
* libio/tst-mmap-offend.c (do_test): Likewise.
* libio/tst-mmap-fflushsync.c (do_test): Likewise.
* libio/tst-mmap-eofsync.c (do_test): Likewise.
* libio/tst-mmap2-eofsync.c (do_test): Likewise.
Diffstat (limited to 'locale/global-locale.c')
-rw-r--r-- | locale/global-locale.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/locale/global-locale.c b/locale/global-locale.c index bec7498dae..a5cae3c5d1 100644 --- a/locale/global-locale.c +++ b/locale/global-locale.c @@ -46,6 +46,14 @@ struct __locale_struct _nl_global_locale attribute_hidden = #include "categories.def" #undef DEFINE_CATEGORY }, + .__names = + { + [LC_ALL] = _nl_C_name, +#define DEFINE_CATEGORY(category, category_name, items, a) \ + [category] = _nl_C_name, +#include "categories.def" +#undef DEFINE_CATEGORY + }, .__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 |