aboutsummaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-06-09 16:28:07 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-06-09 16:28:07 +0000
commita17973efc647439757388bcbee74d73c550af0e1 (patch)
treef976aca529e891f2533d2b44316b3ce83c20daf4 /posix
parent10d33c5a86ad585cea745df7eef60bd80bb154cf (diff)
downloadglibc-a17973efc647439757388bcbee74d73c550af0e1.zip
glibc-a17973efc647439757388bcbee74d73c550af0e1.tar.gz
glibc-a17973efc647439757388bcbee74d73c550af0e1.tar.bz2
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.
Diffstat (limited to 'posix')
-rw-r--r--posix/sys/wait.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index 909979b..f369a4b 100644
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -64,7 +64,7 @@ typedef __pid_t pid_t;
#endif
/* The following values are used by the `waitid' function. */
-#if defined __USE_XOPEN || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
typedef enum
{
P_ALL, /* Wait for any child. */
@@ -104,7 +104,7 @@ extern __pid_t wait (int *__stat_loc);
__THROW. */
extern __pid_t waitpid (__pid_t __pid, int *__stat_loc, int __options);
-#if defined __USE_XOPEN || defined __USE_XOPEN2K8
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
# ifndef __id_t_defined
typedef __id_t id_t;
# define __id_t_defined