From 1ce8aaaedbf549702c607e8a944bcb06b2c37544 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 30 Aug 2002 10:36:44 +0000 Subject: * 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. --- locale/xlocale.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'locale/xlocale.c') diff --git a/locale/xlocale.c b/locale/xlocale.c index 2f9e198aef..d9d3442621 100644 --- a/locale/xlocale.c +++ b/locale/xlocale.c @@ -39,6 +39,14 @@ struct __locale_struct _nl_C_locobj attribute_hidden = #define DEFINE_CATEGORY(category, category_name, items, a) \ [category] = &_nl_C_##category, #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, -- cgit 1.4.1