From ccaf7306707314c44a8f636cc198a80fa7db12b1 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 30 Aug 2002 08:11:12 +0000 Subject: * locale/localename.c: If the current locale is the global locale, use _nl_current_names; otherwise use the locale object. 2002-08-29 Roland McGrath * sysdeps/mach/hurd/bits/local_lim.h (NAME_MAX): New macro. 2002-08-29 Roland McGrath --- locale/localename.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'locale') diff --git a/locale/localename.c b/locale/localename.c index 045cc712d2..377ec296a6 100644 --- a/locale/localename.c +++ b/locale/localename.c @@ -34,9 +34,7 @@ const char * attribute_hidden __current_locale_name (int category) { -#if 0 - return _NL_CURRENT_DATA (category)->name; -#else - return _nl_current_names[category]; -#endif + return (_NL_CURRENT_LOCALE == &_nl_global_locale + ? _nl_current_names[category] + : _NL_CURRENT_LOCALE->__locales[category]->name); } -- cgit v1.2.3