This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-240-g085bbec
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 26 Apr 2016 15:02:51 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-240-g085bbec
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 085bbece2c6afc5f13698b52fac0299445c4317f (commit)
from 6da052fd6a7e589e3a7ffeeec5756518f9d60e1a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=085bbece2c6afc5f13698b52fac0299445c4317f
commit 085bbece2c6afc5f13698b52fac0299445c4317f
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Apr 26 15:02:26 2016 +0000
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 b281c54..5d6ea9e 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 a1759c9..56a7dda 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 481e226..04347eb 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. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
conform/Makefile | 1 -
locale/langinfo.h | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources