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.25-455-g9527ae8
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Jun 2017 17:40:24 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.25-455-g9527ae8
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 9527ae8291dbc6097f4f93c4ccce69b577f8a261 (commit)
from a0f8b1152040d2652cdeb741ac586c95221dc5f0 (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=9527ae8291dbc6097f4f93c4ccce69b577f8a261
commit 9527ae8291dbc6097f4f93c4ccce69b577f8a261
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Jun 12 17:39:47 2017 +0000
Fix XPG4 bsd_signal namespace (bug 21552).
bsd_signal was added in XPG4.2, so should be declared for
__USE_XOPEN_EXTENDED, instead of the present __USE_XOPEN condition.
This patch fixes the condition accordingly.
Tested for x86_64.
[BZ #21552]
* signal/signal.h (bsd_signal): Declare if [__USE_XOPEN_EXTENDED],
not [__USE_XOPEN].
* conform/Makefile (test-xfail-XPG4/signal.h/conform): Remove.
diff --git a/ChangeLog b/ChangeLog
index a066151..f36fa0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2017-06-12 Joseph Myers <joseph@codesourcery.com>
+ [BZ #21552]
+ * signal/signal.h (bsd_signal): Declare if [__USE_XOPEN_EXTENDED],
+ not [__USE_XOPEN].
+ * conform/Makefile (test-xfail-XPG4/signal.h/conform): Remove.
+
[BZ #21550]
* signal/signal.h (sigwait): Only declare if [__USE_POSIX199506].
diff --git a/conform/Makefile b/conform/Makefile
index 68f2e55..9ec41c7 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -161,7 +161,6 @@ test-xfail-XOPEN2K/ndbm.h/conform = yes
test-xfail-XOPEN2K8/ndbm.h/conform = yes
# Unsorted expected failures.
-test-xfail-XPG4/signal.h/conform = yes
test-xfail-XPG42/signal.h/conform = yes
test-xfail-XPG42/sys/wait.h/conform = yes
test-xfail-XPG42/ucontext.h/conform = yes
diff --git a/signal/signal.h b/signal/signal.h
index 5ff94e0..23cd8ef 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -94,7 +94,7 @@ extern __sighandler_t __REDIRECT_NTH (signal,
# endif
#endif
-#if defined __USE_XOPEN && !defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8
/* The X/Open definition of `signal' conflicts with the BSD version.
So they defined another function `bsd_signal'. */
extern __sighandler_t bsd_signal (int __sig, __sighandler_t __handler)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
conform/Makefile | 1 -
signal/signal.h | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources