about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2010-01-12 05:41:52 -0800
committerUlrich Drepper <drepper@redhat.com>2010-01-12 05:41:52 -0800
commit8500fa8325bb9dde4ebb3aa59a52fd2ffdc07f54 (patch)
tree53818a82926e5b1c1870759257c892fe3602a7e9
parente00a72ef5e8c9801d14dc2ece38a8fd03e3d11d8 (diff)
downloadglibc-8500fa8325bb9dde4ebb3aa59a52fd2ffdc07f54.tar.gz
glibc-8500fa8325bb9dde4ebb3aa59a52fd2ffdc07f54.tar.xz
glibc-8500fa8325bb9dde4ebb3aa59a52fd2ffdc07f54.zip
Fix compile error with sys/wait.h.
-rw-r--r--ChangeLog5
-rw-r--r--posix/sys/wait.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 16638da8a3..c9cd999673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* posix/sys/wait.h: Don't define W* macros etc. if
+	stdlib.h has been included with _POSIX_C_SOURCE >= 200809L.
+
 2010-01-11  Ulrich Drepper  <drepper@redhat.com>
 
 	* io/sys/stat.h: Declare fchmod for XPG7.
diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index bb98c00396..6d7f0684c1 100644
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -32,7 +32,7 @@ __BEGIN_DECLS
 #include <sys/resource.h>
 
 /* These macros could also be defined in <stdlib.h>.  */
-#if !defined _STDLIB_H || !defined __USE_XOPEN
+#if !defined _STDLIB_H || (!defined __USE_XOPEN && !defined __USE_XOPEN2K8)
 /* This will define the `W*' macros for the flag
    bits to `waitpid', `wait3', and `wait4'.  */
 # include <bits/waitflags.h>