diff options
author | Ulrich Drepper <drepper@redhat.com> | 2006-05-15 18:36:28 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2006-05-15 18:36:28 +0000 |
commit | 9446614c28b003812b59e99ff1f38aa526234c1c (patch) | |
tree | c7109087c02a598a6d4bb5cba4f77d6e62ce7d12 /intl | |
parent | * iconv/gconv_conf.c (add_alias): Move actual alias handling to... (diff) | |
download | glibc-9446614c28b003812b59e99ff1f38aa526234c1c.tar.gz glibc-9446614c28b003812b59e99ff1f38aa526234c1c.tar.bz2 glibc-9446614c28b003812b59e99ff1f38aa526234c1c.zip |
* locale/setlocale.c: Change _nl_category_names into a string.
Add new _nl_category_name_idxs. Change all users.
* locale/localeinfo.h: Adjust declaration of _nl_category_names.
Declare _nl_category_name_idxs.
* locale/findlocale.c: Adjust for _nl_category_names change.
* locale/loadlocale.c: Likewise.
* locale/newlocale.c: Likewise.
* intl/dcigettext.c: Likewise.
Diffstat (limited to 'intl')
-rw-r--r-- | intl/dcigettext.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intl/dcigettext.c b/intl/dcigettext.c index f294dedf2f..b56196ccbe 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -1,5 +1,5 @@ /* Implementation of the internal dcigettext function. - Copyright (C) 1995-2002,2003,2004,2005 Free Software Foundation, Inc. + Copyright (C) 1995-2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -286,7 +286,8 @@ static const char *guess_category_value PARAMS ((int category, internal_function; #ifdef _LIBC # include "../locale/localeinfo.h" -# define category_to_name(category) _nl_category_names[category] +# define category_to_name(category) \ + _nl_category_names.str + _nl_category_name_idxs[category] #else static const char *category_to_name PARAMS ((int category)) internal_function; #endif |