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

Fix langinfo.h nl_langinfo_l namespace (bug 19996). 

langinfo.h declares nl_langinfo_l if __USE_XOPEN2K.  But this function
was new in the 2008 edition of POSIX.  This patch fixes the condition
accordingly.

Tested for x86_64 and x86 (testsuite, and that installed shared
libraries are unchanged by the patch).

	[BZ #19996]
	* locale/langinfo.h (nl_langinfo_l): Declare if [__USE_XOPEN2K8],
	not [__USE_XOPEN2K].
	* conform/Makefile (test-xfail-XOPEN2K/langinfo.h/conform): Remove
	variable.
This commit is contained in:
Joseph Myers 2016-04-26 15:02:26 +00:00
parent 6da052fd6a
commit 085bbece2c
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2016-04-26 Joseph Myers <joseph@codesourcery.com> 2016-04-26 Joseph Myers <joseph@codesourcery.com>
[BZ #19996]
* locale/langinfo.h (nl_langinfo_l): Declare if [__USE_XOPEN2K8],
not [__USE_XOPEN2K].
* conform/Makefile (test-xfail-XOPEN2K/langinfo.h/conform): Remove
variable.
* conform/data/stdarg.h-data [XOPEN2K] (va_copy): Require macro. * conform/data/stdarg.h-data [XOPEN2K] (va_copy): Require macro.
* conform/Makefile (test-xfail-XOPEN2K/stdarg.h/conform): Remove * conform/Makefile (test-xfail-XOPEN2K/stdarg.h/conform): Remove
variable. variable.

1
conform/Makefile
View File

@ -211,7 +211,6 @@ test-xfail-UNIX98/unistd.h/conform = yes
test-xfail-UNIX98/utmpx.h/conform = yes test-xfail-UNIX98/utmpx.h/conform = yes
test-xfail-XOPEN2K/aio.h/conform = yes test-xfail-XOPEN2K/aio.h/conform = yes
test-xfail-XOPEN2K/fcntl.h/conform = yes test-xfail-XOPEN2K/fcntl.h/conform = yes
test-xfail-XOPEN2K/langinfo.h/conform = yes
test-xfail-XOPEN2K/mqueue.h/conform = yes test-xfail-XOPEN2K/mqueue.h/conform = yes
test-xfail-XOPEN2K/semaphore.h/conform = yes test-xfail-XOPEN2K/semaphore.h/conform = yes
test-xfail-XOPEN2K/signal.h/conform = yes test-xfail-XOPEN2K/signal.h/conform = yes

2
locale/langinfo.h
View File

@ -583,7 +583,7 @@ enum
extern char *nl_langinfo (nl_item __item) __THROW; extern char *nl_langinfo (nl_item __item) __THROW;
#ifdef __USE_XOPEN2K #ifdef __USE_XOPEN2K8
/* This interface is for the extended locale model. See <locale.h> for /* This interface is for the extended locale model. See <locale.h> for
more information. */ more information. */