diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-04-26 15:02:26 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-04-26 15:02:26 +0000 |
| commit | 085bbece2c6afc5f13698b52fac0299445c4317f (patch) | |
| tree | a317279d72ac9577579e2be8f3c403fe464398c3 | |
| parent | 6da052fd6a7e589e3a7ffeeec5756518f9d60e1a (diff) | |
| download | glibc-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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | conform/Makefile | 1 | ||||
| -rw-r--r-- | locale/langinfo.h | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index b281c54a7d..5d6ea9e376 100644 --- 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 a1759c929a..56a7dda2a2 100644 --- 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 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. */ |