submitted-waitid

Gbp-Pq: Topic kfreebsd
Gbp-Pq: Name submitted-waitid.diff

diff --git a/bits/waitflags.h b/bits/waitflags.h
index abc3816280ce01de87806f7a46cf676a4ead66f5..9651ae6a14cead0541caa1ed4b10bfc4a902a7a1 100644 (file)
--- a/bits/waitflags.h
+++ b/bits/waitflags.h
@@ -24,3 +24,16 @@
 /* Bits in the third argument to `waitpid'.  */
 #define        WNOHANG         1       /* Don't block waiting.  */
 #define        WUNTRACED       2       /* Report status of stopped children.  */
+
+/* The following values are used by the `waitid' function.  */
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
+# ifndef __ENUM_IDTYPE_T
+# define __ENUM_IDTYPE_T 1
+typedef enum
+{
+  P_ALL,               /* Wait for any child.  */
+  P_PID,               /* Wait for specified process.  */
+  P_PGID               /* Wait for members of process group.  */
+} idtype_t;
+# endif
+#endif

diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index 6bb6668941f749b4077ab50a8487c62f8768a704..bb00b5023d83f612fb987c3c26c221b090b98dcb 100644 (file)
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -69,17 +69,6 @@ typedef __pid_t pid_t;
 # define W_STOPCODE(sig)       __W_STOPCODE (sig)
 #endif
 
-/* The following values are used by the `waitid' function.  */
-#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
-typedef enum
-{
-  P_ALL,               /* Wait for any child.  */
-  P_PID,               /* Wait for specified process.  */
-  P_PGID               /* Wait for members of process group.  */
-} idtype_t;
-#endif
-
-
 /* Wait for a child to die.  When one does, put its status in *STAT_LOC
    and return its process ID.  For errors, return (pid_t) -1.
 

diff --git a/sysdeps/unix/sysv/linux/bits/waitflags.h b/sysdeps/unix/sysv/linux/bits/waitflags.h
index f0ea981f2063e78d43fd27a40b41c89697299fa3..a485e285fb349d92787f7c1c3978af82f8a93b22 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/waitflags.h
+++ b/sysdeps/unix/sysv/linux/bits/waitflags.h
@@ -37,3 +37,23 @@
                                      in this group */
 #define __WALL         0x40000000 /* Wait for any child.  */
 #define __WCLONE       0x80000000 /* Wait for cloned process.  */
+
+/* The following values are used by the `waitid' function.  */
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
+# ifndef __ENUM_IDTYPE_T
+# define __ENUM_IDTYPE_T 1
+
+/* The Linux kernel defines these bare, rather than an enum,
+   which causes a conflict if the include order is reversed. */
+# undef P_ALL
+# undef P_PID
+# undef P_PGID
+
+typedef enum
+{
+  P_ALL,               /* Wait for any child.  */
+  P_PID,               /* Wait for specified process.  */
+  P_PGID               /* Wait for members of process group.  */
+} idtype_t;
+# endif
+#endif