qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix _NC_LOCALE_NAME definition.

This commit is contained in:
Ulrich Drepper 2009-11-17 09:18:11 -08:00
parent 2866eeb1b7
commit 4fb9241e4e
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2009-11-17 Ulrich Drepper <drepper@redhat.com> 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] [BZ #10972]
* sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Add new MADV_* * sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Add new MADV_*
constants from recent kernels. constants from recent kernels.

4
locale/Makefile
View File

@ -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. # This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or # 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 \ routines = setlocale findlocale loadlocale loadarchive \
localeconv nl_langinfo nl_langinfo_l mb_cur_max \ localeconv nl_langinfo nl_langinfo_l mb_cur_max \
newlocale duplocale freelocale uselocale newlocale duplocale freelocale uselocale
tests = tst-C-locale tests = tst-C-locale tst-locname
categories = ctype messages monetary numeric time paper name \ categories = ctype messages monetary numeric time paper name \
address telephone measurement identification collate address telephone measurement identification collate
aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \

3
locale/langinfo.h
View File

@ -568,7 +568,8 @@ enum
/* This macro produces an item you can pass to `nl_langinfo' or /* 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. */ `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 #ifdef __USE_GNU
# define NL_LOCALE_NAME(category) _NL_LOCALE_NAME (category) # define NL_LOCALE_NAME(category) _NL_LOCALE_NAME (category)
#endif #endif