From: Bruno Haible Date: Thu, 18 May 2006 17:01:46 +0000 (+0000) Subject: No-op. (Merge from glibc.) X-Git-Tag: v0.15~123 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a82d7c94f9cdfb2129d794e526efee03c63c3616;p=thirdparty%2Fgettext.git No-op. (Merge from glibc.) --- diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 0b36ec46a..2a4d71374 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,8 @@ +2006-05-15 Ulrich Drepper + + * dcigettext.c (category_to_name): Adjust for _nl_category_names + change. + 2006-04-06 Ulrich Drepper * finddomain.c (_nl_find_domain): We never return NULL if we found the diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c index b0f874b92..861c49cd4 100644 --- a/gettext-runtime/intl/dcigettext.c +++ b/gettext-runtime/intl/dcigettext.c @@ -1,5 +1,5 @@ /* Implementation of the internal dcigettext function. - Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -356,7 +356,8 @@ static const char *guess_category_value (int category, #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 (int category) internal_function; #endif