(__WAIT_STATUS): Always use non-GCC defn, for now.

[kopensolaris-gnu/glibc.git] / posix / sys / wait.h

diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index d31cfcc..b7800d7 100644 (file)
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -28,43 +28,15 @@ Cambridge, MA 02139, USA.  */
 __BEGIN_DECLS
 
 #include <gnu/types.h>
-#include <gnu/wait.h>
 
-
-#define        WNOHANG         __WNOHANG
-#define        WUNTRACED       __WUNTRACED
-
-
-/* Encoding of the status word.  */
-
-#include <endian.h>
+/* This will define the `W*' macros for the flag
+   bits to `waitpid', `wait3', and `wait4'.  */
+#include <waitflags.h>
 
 #ifdef __USE_BSD
-union __wait
-{
-#ifdef __LITTLE_ENDIAN
-  struct
-  {
-    unsigned int __w_termsig:7;
-    unsigned int __w_coredump:1;
-    unsigned int __w_retcode:8;
-    unsigned int:16;
-  } __wait_status;
-#else /* Big endian.  */
-  struct
-  {
-    unsigned int:16;
-    unsigned int __w_retcode:8;
-    unsigned int __w_coredump:1;
-    unsigned int __w_termsig:7;
-  } __wait_status;
-#endif /* Little endian.  */
-};
-
-#define        w_termsig       __wait_status.__w_termsig
-#define        w_coredump      __wait_status.__w_coredump
-#define        w_retcode       __wait_status.__w_retcode
-#define        w_stopsig       w_retcode
+
+/* Lots of hair to allow traditional BSD use of `union wait'
+   as well as POSIX.1 use of `int' for the status word.  */
 
 #ifdef __GNUC__
 #define        __WAIT_INT(status)                                                    \
@@ -75,18 +47,40 @@ union __wait
 #endif
 
 /* This is the type of the argument to `wait'.
-   With GCC v2, this will be a strange union.  */
 
-#define        __WAIT_STATUS   __ptr_t
+   NOTE: Since this functionality is volatile, I'm disabling the use of it for
+   now.
+
+With GCC 2.6.1 and later, the funky union causes redeclarations with either
+   `int *' or `union wait *' to be allowed without complaint.
+   __WAIT_STATUS_DEFN is the type used in the actual function
+   definitions. */
+
+#if    (!defined (__GNUC__) || __GNUC__ < 2 || \
+        /*(__GNUC__ == 2 && __GNUC_MINOR__ < 6)*/ 1)
+#define        __WAIT_STATUS           __ptr_t
+#define        __WAIT_STATUS_DEFN      __ptr_t
+#else
+/* This works in GCC 2.6.1 and later.  */
+typedef union
+  {
+    union wait *__uptr;
+    int *__iptr;
+  } __WAIT_STATUS __attribute__ ((transparent_union));
+#define        __WAIT_STATUS_DEFN      int *
+#endif
 
 #else /* Don't use BSD.  */
 
 #define        __WAIT_INT(status)      (status)
-
-#define        __WAIT_STATUS   int *
+#define        __WAIT_STATUS           int *
+#define        __WAIT_STATUS_DEFN      int *
 
 #endif /* Use BSD.  */
 
+/* This will define all the `__W*' macros.  */
+#include <waitstatus.h>
+
 #define        WEXITSTATUS(status)     __WEXITSTATUS(__WAIT_INT(status))
 #define        WTERMSIG(status)        __WTERMSIG(__WAIT_INT(status))
 #define        WSTOPSIG(status)        __WSTOPSIG(__WAIT_INT(status))
@@ -95,6 +89,7 @@ union __wait
 #define        WIFSTOPPED(status)      __WIFSTOPPED(__WAIT_INT(status))
 
 #ifdef __USE_BSD
+#define        WCOREFLAG               __WCOREFLAG
 #define        WCOREDUMP(status)       __WCOREDUMP(__WAIT_INT(status))
 #define        W_EXITCODE(ret, sig)    __W_EXITCODE(ret, sig)
 #define        W_STOPCODE(sig)         __W_STOPCODE(sig)
@@ -126,7 +121,11 @@ extern __pid_t wait __P ((__WAIT_STATUS __stat_loc));
    set in OPTIONS, return status for stopped children; otherwise don't.  */
 extern __pid_t __waitpid __P ((__pid_t __pid, int *__stat_loc,
                               int __options));
+extern __pid_t waitpid __P ((__pid_t __pid, int *__stat_loc,
+                            int __options));
 #ifdef __USE_BSD
+/* This being here makes the prototypes valid whether or not
+   we have already included <sys/resource.h> to define `struct rusage'.  */
 struct rusage;
 
 /* Wait for a child to exit.  When one does, put its status in *STAT_LOC and
@@ -134,19 +133,18 @@ struct rusage;
    nil, store information about the child's resource usage there.  If the
    WUNTRACED bit is set in OPTIONS, return status for stopped children;
    otherwise don't.  */
-extern __pid_t __wait3 __P ((union __wait * __stat_loc,
+extern __pid_t __wait3 __P ((__WAIT_STATUS __stat_loc,
                             int __options, struct rusage * __usage));
-#define        wait3   __wait3
+extern __pid_t wait3 __P ((__WAIT_STATUS __stat_loc,
+                          int __options, struct rusage * __usage));
 
 /* PID is like waitpid.  Other args are like wait3.  */
-extern __pid_t __wait4 __P ((__pid_t __pid, union __wait * __stat_loc,
-                            int __options, struct rusage * __usage));
-#define        wait4   __wait4
+extern __pid_t __wait4 __P ((__pid_t __pid, __WAIT_STATUS __stat_loc,
+                            int __options, struct rusage *__usage));
+extern __pid_t wait4 __P ((__pid_t __pid, __WAIT_STATUS __stat_loc,
+                          int __options, struct rusage *__usage));
 #endif /* Use BSD.  */
 
-#define        waitpid __waitpid
-#define        wait    __wait
-
 
 __END_DECLS