diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | locale/localename.c | 8 |
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 9e01dfae7a..f6e061a11f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-08-30 Roland McGrath <roland@redhat.com> + + * locale/localename.c: If the current locale is the global locale, use + _nl_current_names; otherwise use the locale object. + 2002-08-29 Ulrich Drepper <drepper@redhat.com> * libio/fileops.c (_IO_new_file_fopen): Recognize new mode specifier @@ -11,7 +16,9 @@ * libio/iofdopen.c (_IO_new_fdopen): Recognize 'm' mode specifier. Enable mmap-using mode only if 'm' was set. -2002-08-29 Roland McGrath <roland@redhat.com> +2002-08-29 Roland McGrath <roland@frob.com> + + * sysdeps/mach/hurd/bits/local_lim.h (NAME_MAX): New macro. * sysdeps/mach/hurd/i386/init-first.c (_hurd_stack_setup: doinit): Change argument type from int to intptr_t. @@ -40,6 +47,8 @@ * mach/mach.h: Include <features.h>. +2002-08-29 Roland McGrath <roland@redhat.com> + * elf/dl-runtime.c (IN_DL_RUNTIME): Define this macro first thing. * sysdeps/i386/dl-machine.h: Only declare fixup, profile_fixup and define ELF_MACHINE_RUNTIME_TRAMPOLINE under #ifdef IN_DL_RUNTIME. 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); } |