From: Joseph Myers Date: Mon, 12 Jun 2017 17:39:47 +0000 (+0000) Subject: Fix XPG4 bsd_signal namespace (bug 21552). X-Git-Tag: glibc-2.26~371 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9527ae8291dbc6097f4f93c4ccce69b577f8a261;p=thirdparty%2Fglibc.git 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 a066151215d..f36fa0ee0f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-06-12 Joseph Myers + [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 68f2e552985..9ec41c7244a 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 5ff94e0d254..23cd8efb14c 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)