summary refs log tree commit diff
path: root/posix
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-06-19 16:39:17 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-06-19 16:39:17 +0000
commitbf15120dd7860ac976f22e20fa386d8bf73c70e7 (patch)
tree4ddf39cf62f1948a76973ec163cbc14438c35c2b /posix
parent4add86749a31f302674599b69d2eea691d69341a (diff)
downloadglibc-bf15120dd7860ac976f22e20fa386d8bf73c70e7.tar.gz
glibc-bf15120dd7860ac976f22e20fa386d8bf73c70e7.tar.xz
glibc-bf15120dd7860ac976f22e20fa386d8bf73c70e7.zip
Fix wait3 namespace (bug 21625).
The wait3 function was removed in the 2001 edition of POSIX.
sys/wait.h wrongly declares it for the 2001 and 2008 editions of POSIX
when XSI features are enabled.  This patch fixes the conditionals.

Tested for x86_64.

	[BZ #21625]
	* posix/sys/wait.h (strust rusage forward declaration): Change
	[__USE_XOPEN_EXTENDED] conditional to [__USE_XOPEN_EXTENDED &&
	!__USE_XOPEN2K].
	(wait3): Likewise.
Diffstat (limited to 'posix')
-rw-r--r--posix/sys/wait.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index 29ca453742..6bb6668941 100644
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -133,7 +133,8 @@ extern int waitid (idtype_t __idtype, __id_t __id, siginfo_t *__infop,
 		   int __options);
 #endif
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
+#if defined __USE_MISC \
+    || (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K)
 /* This being here makes the prototypes valid whether or not
    we have already included <sys/resource.h> to define `struct rusage'.  */
 struct rusage;