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 a066151215de957629f7c7cafb5aaa18ffac527f..f36fa0ee0f4c2f66a3c0faf0794c49e171a90456 100644 (file)
--- 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 68f2e552985341129671f160b4526667449f9a20..9ec41c7244ad10f87f6073e6731c981efa2d4d45 100644 (file)
--- 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 5ff94e0d25487954c99cde491a0af3ba59aa475a..23cd8efb14c1e4c1aa2cbe0d4d80bf698cc0b9bd 100644 (file)
--- 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)