From a17973efc647439757388bcbee74d73c550af0e1 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 9 Jun 2017 16:28:07 +0000
Subject: Fix waitid namespace (bug 21561).

In sys/wait.h, waitid and associated constants and types are UX-shaded
in XPG4.2 (so not in XPG4), and XSI-shaded in POSIX before 2008, so
should be appropriately conditional in the headers.  This patch fixes
the conditionals accordingly.  (WCONTINUED is actually still
XSI-shaded in POSIX.1:2008, but W* is also reserved there without
XSI-shading, so nothing special needs to be done about the
conditionals on WCONTINUED to conform to POSIX.1:2008 namespace
rules.)

Tested for x86_64.

	[BZ #21561]
	* posix/sys/wait.h (idtype_t): Change [__USE_XOPEN] condition to
	[__USE_XOPEN_EXTENDED].
	(id_t): Likewise.
	(include of <bits/types/siginfo_t.h): Likewise.
	(waitid): Likewise.
	* sysdeps/unix/sysv/linux/bits/waitflags.h (WSTOPPED): Condition
	on [__USE_XOPEN_EXTENDED || __USE_XOPEN2K8].
	(WEXITED): Likewise.
	(WCONTINUED): Likewise.
	(WNOWAIT): Likewise.
	* conform/Makefile (test-xfail-XPG4/stdlib.h/conform): Remove.
	(test-xfail-XPG4/sys/wait.h/conform): Likewise.
	(test-xfail-POSIX/sys/wait.h/conform): Likewise.
---
 ChangeLog | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index c72917021e..519959a911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2017-06-09  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #21561]
+	* posix/sys/wait.h (idtype_t): Change [__USE_XOPEN] condition to
+	[__USE_XOPEN_EXTENDED].
+	(id_t): Likewise.
+	(include of <bits/types/siginfo_t.h): Likewise.
+	(waitid): Likewise.
+	* sysdeps/unix/sysv/linux/bits/waitflags.h (WSTOPPED): Condition
+	on [__USE_XOPEN_EXTENDED || __USE_XOPEN2K8].
+	(WEXITED): Likewise.
+	(WCONTINUED): Likewise.
+	(WNOWAIT): Likewise.
+	* conform/Makefile (test-xfail-XPG4/stdlib.h/conform): Remove.
+	(test-xfail-XPG4/sys/wait.h/conform): Likewise.
+	(test-xfail-POSIX/sys/wait.h/conform): Likewise.
+
 	* sysdeps/unix/sysv/linux/nios2/localplt.data (__gtdf2): Mark
 	libc.so PLT entry optional.
 	(__gtsf2): Likewise.
-- 
cgit 1.4.1