No-op. (Merge from glibc.)

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 0b36ec46a101fa2f1b3640a264197b95ecd3b4c9..2a4d7137464a543af622f3422400cbaa0b0eaf07 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-15  Ulrich Drepper  <drepper@redhat.com>
+
+       * dcigettext.c (category_to_name): Adjust for _nl_category_names
+       change.
+
 2006-04-06  Ulrich Drepper  <drepper@redhat.com>
 
        * 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 b0f874b929601b3c6390ec7c1b0b9fe5102caf7a..861c49cd46e0846babf1396fe64f415f5b5a674a 100644 (file)
--- 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