Fix _NC_LOCALE_NAME definition.

diff --git a/ChangeLog b/ChangeLog
index 26153bd..8dfb46e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-11-17  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #10968]
+       * locale/langinfo.h (_NL_LOCALE_NAME): Correct definition.
+       Patch by Bruno Haible <bruno@clisp.org>.
+       * locale/tst-locname.c: New file.
+       * locale/Makefile (tests): Add tst-locname.
+
        [BZ #10972]
        * sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Add new MADV_*
        constants from recent kernels.

diff --git a/locale/Makefile b/locale/Makefile
index d9ab194..2d645da 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,1992,1995-2003,2005 Free Software Foundation, Inc.
+# Copyright (C) 1991,1992,1995-2003,2005,2009 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
@@ -38,7 +38,7 @@ distribute    = localeinfo.h categories.def iso-639.def iso-3166.def \
 routines       = setlocale findlocale loadlocale loadarchive \
                  localeconv nl_langinfo nl_langinfo_l mb_cur_max \
                  newlocale duplocale freelocale uselocale
-tests          = tst-C-locale
+tests          = tst-C-locale tst-locname
 categories     = ctype messages monetary numeric time paper name \
                  address telephone measurement identification collate
 aux            = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
@@ -104,7 +104,7 @@ CFLAGS-charmap-dir.c = -Wno-write-strings
 
 # This makes sure -DNOT_IN_libc is passed for all these modules.
 cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \
-                               $(locale-modules) $(lib-modules))
+                               $(locale-modules) $(lib-modules))
 lib := nonlib
 include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
 

diff --git a/locale/langinfo.h b/locale/langinfo.h
index c940c74..0a53365 100644 (file)
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -568,7 +568,8 @@ enum
 
 /* This macro produces an item you can pass to `nl_langinfo' or
    `nl_langinfo_l' to get the name of the locale in use for CATEGORY.  */
-#define _NL_LOCALE_NAME(category)      _NL_ITEM ((category), -1)
+#define _NL_LOCALE_NAME(category)      _NL_ITEM ((category),                 \
+                                                 _NL_ITEM_INDEX (-1))
 #ifdef __USE_GNU
 # define NL_LOCALE_NAME(category)      _NL_LOCALE_NAME (category)
 #endif