* 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  <roland@frob.com>

	* sysdeps/mach/hurd/bits/local_lim.h (NAME_MAX): New macro.
2002-08-29  Roland McGrath  <roland@redhat.com>
This commit is contained in:
Roland McGrath 2002-08-30 08:11:12 +00:00
parent 44fbaddd54
commit ccaf730670
2 changed files with 13 additions and 6 deletions

View File

@ -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> 2002-08-29 Ulrich Drepper <drepper@redhat.com>
* libio/fileops.c (_IO_new_file_fopen): Recognize new mode specifier * 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. * libio/iofdopen.c (_IO_new_fdopen): Recognize 'm' mode specifier.
Enable mmap-using mode only if 'm' was set. 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): * sysdeps/mach/hurd/i386/init-first.c (_hurd_stack_setup: doinit):
Change argument type from int to intptr_t. Change argument type from int to intptr_t.
@ -40,6 +47,8 @@
* mach/mach.h: Include <features.h>. * 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. * elf/dl-runtime.c (IN_DL_RUNTIME): Define this macro first thing.
* sysdeps/i386/dl-machine.h: Only declare fixup, profile_fixup and * sysdeps/i386/dl-machine.h: Only declare fixup, profile_fixup and
define ELF_MACHINE_RUNTIME_TRAMPOLINE under #ifdef IN_DL_RUNTIME. define ELF_MACHINE_RUNTIME_TRAMPOLINE under #ifdef IN_DL_RUNTIME.

View File

@ -34,9 +34,7 @@ const char *
attribute_hidden attribute_hidden
__current_locale_name (int category) __current_locale_name (int category)
{ {
#if 0 return (_NL_CURRENT_LOCALE == &_nl_global_locale
return _NL_CURRENT_DATA (category)->name; ? _nl_current_names[category]
#else : _NL_CURRENT_LOCALE->__locales[category]->name);
return _nl_current_names[category];
#endif
} }