aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--signal/signal.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f5d749b..7d023fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2017-05-04 Joseph Myers <joseph@codesourcery.com>
+ [BZ #21445]
+ * signal/signal.h [__USE_XOPEN2K8] (bsd_signal): Do not declare.
+
[BZ #21457]
* sysdeps/unix/sysv/linux/mips/sys/ucontext.h
[_MIPS_SIM != _ABIO32] (mcontext_t): Rename field reserved to
diff --git a/signal/signal.h b/signal/signal.h
index 84f2a1f..6db2d2f 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -108,7 +108,7 @@ extern __sighandler_t __REDIRECT_NTH (signal,
# endif
#endif
-#ifdef __USE_XOPEN
+#if defined __USE_XOPEN && !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)