Fix up sys/wait.h header for XPG7.

diff --git a/ChangeLog b/ChangeLog
index 1410b79..00c7710 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
 
        * posix/glob.h: Define size_t.
 
+       * posix/sys/wait.h: Define idtype_t and declare waitid for XPG7.
+
 2010-01-10  Ulrich Drepper  <drepper@redhat.com>
 
        * conform/conformtest.pl: For XPG7 testing the headers are supposed to

diff --git a/conform/data/sys/wait.h-data b/conform/data/sys/wait.h-data
index 81c0dc4..2fd4c8d 100644 (file)
--- a/conform/data/sys/wait.h-data
+++ b/conform/data/sys/wait.h-data
@@ -48,7 +48,9 @@ element {struct rusage} {struct timeval} ru_stime
 type pid_t
 
 function pid_t wait (int*)
+#if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008
 function pid_t wait3 (int*, int, struct rusage*)
+#endif
 function int waitid (idtype_t, id_t, siginfo_t*, int)
 function pid_t waitpid (pid_t, int*, int)
 

diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index d924842..bb98c00 100644 (file)
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1994,1996-2001,2003,2004,2005,2007,2009
+/* Copyright (C) 1991-1994,1996-2001,2003,2004,2005,2007,2009,2010
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -45,7 +45,7 @@ __BEGIN_DECLS
 #  if defined __GNUC__ && !defined __cplusplus
 #   define __WAIT_INT(status) \
   (__extension__ (((union { __typeof(status) __in; int __i; }) \
-                   { .__in = (status) }).__i))
+                  { .__in = (status) }).__i))
 #  else
 #   define __WAIT_INT(status)  (*(__const int *) &(status))
 #  endif
@@ -98,7 +98,7 @@ typedef union
 #endif
 
 /* The following values are used by the `waitid' function.  */
-#if defined __USE_SVID || defined __USE_XOPEN
+#if defined __USE_SVID || defined __USE_XOPEN || defined __USE_XOPEN2K8
 typedef enum
 {
   P_ALL,               /* Wait for any child.  */
@@ -138,7 +138,7 @@ extern __pid_t wait (__WAIT_STATUS __stat_loc);
    __THROW.  */
 extern __pid_t waitpid (__pid_t __pid, int *__stat_loc, int __options);
 
-#if defined __USE_SVID || defined __USE_XOPEN
+#if defined __USE_SVID || defined __USE_XOPEN || defined __USE_XOPEN2K8
 # define __need_siginfo_t
 # include <bits/siginfo.h>
 /* Wait for a childing matching IDTYPE and ID to change the status and