Fix XPG4 bsd_signal namespace (bug 21552)

Message ID alpine.DEB.2.20.1706052118020.30446@digraph.polyomino.org.uk
State New, archived
Headers

Commit Message

Joseph Myers June 5, 2017, 9:18 p.m. UTC
  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.  Because of other namespace problems this does not
allow any conform/ XFAILs to be removed.

2017-06-05  Joseph Myers  <joseph@codesourcery.com>

	[BZ #21552]
	* signal/signal.h (bsd_signal): Declare if [__USE_XOPEN_EXTENDED],
	not [__USE_XOPEN].
  

Comments

Joseph Myers June 12, 2017, 3:36 p.m. UTC | #1
Ping.  This patch 
<https://sourceware.org/ml/libc-alpha/2017-06/msg00191.html> is pending 
review.
  
Andreas Schwab June 12, 2017, 4:42 p.m. UTC | #2
On Jun 05 2017, Joseph Myers <joseph@codesourcery.com> wrote:

> 	[BZ #21552]
> 	* signal/signal.h (bsd_signal): Declare if [__USE_XOPEN_EXTENDED],
> 	not [__USE_XOPEN].

Ok.

Andreas.
  

Patch

diff --git a/signal/signal.h b/signal/signal.h
index b311473..8a140d4 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)