(output_method): New method: output_win32.

[gnu-emacs] / src / syswait.h

diff --git a/src/syswait.h b/src/syswait.h
index 41214ea54cf6f7c9473fd3a85307b38075ebf557..f83989bf2df888ef24464c635cc709823de172e9 100644 (file)
--- 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 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -23,6 +23,16 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef VMS
 #ifndef WAITTYPE
+
+#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) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER)) || defined (LINUX)
 #define WAITTYPE int
 #define WIFSTOPPED(w) ((w&0377) == 0177)
@@ -34,7 +44,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef WCOREDUMP
 #define WCOREDUMP(w) ((w&0200) != 0)
 #endif
+
 #else 
+
 #ifdef BSD4_1
 #include <wait.h>
 #else
@@ -43,16 +55,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
@@ -70,8 +84,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define WIFEXITED(w) (WTERMSIG (w) == 0)
 #endif
 #endif /* BSD or UNIPLUS or STRIDE */
+#endif /* not WAIT_USE_INT */
 #endif /* no WAITTYPE */
+
 #else /* VMS */
+
 #define WAITTYPE int
 #define WIFSTOPPED(w) 0
 #define WIFSIGNALED(w) 0
@@ -84,4 +101,5 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <iodef.h>
 #include <clidef.h>
 #include "vmsproc.h"
+
 #endif /* VMS */