about summary refs log tree commit diff
path: root/locale
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-04-26 15:02:26 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-04-26 15:02:26 +0000
commit085bbece2c6afc5f13698b52fac0299445c4317f (patch)
treea317279d72ac9577579e2be8f3c403fe464398c3 /locale
parent6da052fd6a7e589e3a7ffeeec5756518f9d60e1a (diff)
downloadglibc-085bbece2c6afc5f13698b52fac0299445c4317f.tar.gz
glibc-085bbece2c6afc5f13698b52fac0299445c4317f.tar.xz
glibc-085bbece2c6afc5f13698b52fac0299445c4317f.zip
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.
Diffstat (limited to 'locale')
-rw-r--r--locale/langinfo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/langinfo.h b/locale/langinfo.h
index 481e2263d7..04347eb2b8 100644
--- 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.  */