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.

diff --git a/ChangeLog b/ChangeLog
index b281c54a7d8ca9dc0eadf0519032a61766323329..5d6ea9e3768660bbafef2d8a03a491835bebb72d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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/Makefile (test-xfail-XOPEN2K/stdarg.h/conform): Remove
        variable.

diff --git a/conform/Makefile b/conform/Makefile
index a1759c929a880240a80625ed114efa90e8c62938..56a7dda2a2a211e3319f8f263e6a1de0675819db 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -211,7 +211,6 @@ test-xfail-UNIX98/unistd.h/conform = yes
 test-xfail-UNIX98/utmpx.h/conform = yes
 test-xfail-XOPEN2K/aio.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/semaphore.h/conform = yes
 test-xfail-XOPEN2K/signal.h/conform = yes

diff --git a/locale/langinfo.h b/locale/langinfo.h
index 481e2263d7e5543be62b9d35485174260a1248f8..04347eb2b897d4b2e69bf58cbbd48d24f59a4092 100644 (file)
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -583,7 +583,7 @@ enum
 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
    more information.  */