X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/43626ea48d524e02863127fad847e1e4a771cded..8030369ccb5c871d3ce11b96c220f318bc741ed8:/src/syswait.h

diff --git a/src/syswait.h b/src/syswait.h
index 41214ea54c..da5e52c689 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -1,5 +1,5 @@
 /* Define wait system call interface for Emacs.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,26 +15,85 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Define the structure that the wait system call stores.
    On many systems, there is a structure defined for this.
    But on vanilla-ish USG systems there is not.  */
 
+#ifndef EMACS_SYSWAIT_H
+#define EMACS_SYSWAIT_H
+
 #ifndef VMS
+
+/* Try the approach recommended by autoconf.  If this doesn't cause
+   trouble anywhere, remove the original code, which is #if'd out
+   below.  */
+
+#if 1
+#include <sys/types.h>
+
+#ifdef HAVE_SYS_WAIT_H	/* We have sys/wait.h with POSIXoid definitions. */
+
+#include <sys/wait.h>
+#ifndef WCOREDUMP		/* not POSIX */
+#define WCOREDUMP(status) ((status) & 0x80)
+#endif
+
+#else  /* !HAVE_SYS_WAIT_H */
+
+/* Note that sys/wait.h may still be included by stdlib.h or something
+   according to XPG.  */
+
+#undef WEXITSTATUS
+#define WEXITSTATUS(status) (((status)  & 0xff00) >> 8)
+#undef WIFEXITED
+#define WIFEXITED(status) (WTERMSIG(status) == 0)
+#undef WIFSTOPPED
+#define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
+#undef WIFSIGNALED
+#define WIFSIGNALED(status) (!WIFSTOPPED(status) && !WIFEXITED(status))
+#undef WSTOPSIG
+#define WSTOPSIG(status) WEXITSTATUS(status)
+#undef WTERMSIG
+#define WTERMSIG(status) ((status) & 0x7f)
+#undef WCOREDUMP
+#define WCOREDUMP(status) ((status) & 0x80)
+#endif /* HAVE_SYS_WAIT_H */
+
+#undef WAITTYPE
+#define WAITTYPE int
+#undef WRETCODE
+#define WRETCODE(status) WEXITSTATUS (status)
+
+#else  /* !1 */
+
 #ifndef WAITTYPE
-#if (!defined (BSD) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER)) || defined (LINUX)
+
+#ifdef WAIT_USE_INT
+/* Some systems have  union wait  in their header, but we should use
+   int regardless of that.  */
+#include <sys/wait.h>
+#define WAITTYPE int
+#define WRETCODE(w) WEXITSTATUS (w)
+
+#else /* not WAIT_USE_INT */
+
+#if (!defined (BSD_SYSTEM) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER))
 #define WAITTYPE int
 #define WIFSTOPPED(w) ((w&0377) == 0177)
 #define WIFSIGNALED(w) ((w&0377) != 0177 && (w&~0377) == 0)
 #define WIFEXITED(w) ((w&0377) == 0)
 #define WRETCODE(w) (w >> 8)
 #define WSTOPSIG(w) (w >> 8)
-#define WTERMSIG(w) (w & 0377)
+#define WTERMSIG(w) (w & 0177)
 #ifndef WCOREDUMP
 #define WCOREDUMP(w) ((w&0200) != 0)
 #endif
+
 #else 
+
 #ifdef BSD4_1
 #include <wait.h>
 #else
@@ -43,16 +102,18 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define WAITTYPE union wait
 #define WRETCODE(w) w.w_retcode
+#undef WCOREDUMP		/* Later BSDs define this name differently.  */
 #define WCOREDUMP(w) w.w_coredump
 
-#ifdef HPUX
+#if defined (HPUX) || defined (convex)
 /* HPUX version 7 has broken definitions of these.  */
+/* pvogel@convex.com says the convex does too.  */
 #undef WTERMSIG
 #undef WSTOPSIG
 #undef WIFSTOPPED
 #undef WIFSIGNALED
 #undef WIFEXITED
-#endif
+#endif /* HPUX | convex */
 
 #ifndef WTERMSIG
 #define WTERMSIG(w) w.w_termsig
@@ -69,9 +130,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef WIFEXITED
 #define WIFEXITED(w) (WTERMSIG (w) == 0)
 #endif
-#endif /* BSD or UNIPLUS or STRIDE */
+#endif /* BSD_SYSTEM || UNIPLUS || STRIDE || HPUX */
+#endif /* not WAIT_USE_INT */
 #endif /* no WAITTYPE */
+
+#endif /* 1 */
+
 #else /* VMS */
+
 #define WAITTYPE int
 #define WIFSTOPPED(w) 0
 #define WIFSIGNALED(w) 0
@@ -84,4 +150,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <iodef.h>
 #include <clidef.h>
 #include "vmsproc.h"
+
 #endif /* VMS */
+
+#endif /* EMACS_SYSWAIT_H */