summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--posix/sys/wait.h3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b3d39a23fd..0c637c2da9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2017-06-19 Joseph Myers <joseph@codesourcery.com>
+ [BZ #21625]
+ * posix/sys/wait.h (strust rusage forward declaration): Change
+ [__USE_XOPEN_EXTENDED] conditional to [__USE_XOPEN_EXTENDED &&
+ !__USE_XOPEN2K].
+ (wait3): Likewise.
+
* configure.ac (libc_cv_compiler_ok): Require GCC 4.9 or later.
* configure: Regenerated.
* manual/install.texi (Tools for Compilation): Document
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;