(timezone-parse-date): Use < 69 not < 70 to distinguish 20YY from 19YY.

[bpt/emacs.git] / src / syswait.h

diff --git a/src/syswait.h b/src/syswait.h
index 95bf5ac..1889c36 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.
 
@@ -15,7 +15,8 @@ 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.
@@ -23,7 +24,17 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef VMS
 #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)
@@ -34,7 +45,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,6 +56,7 @@ 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
 
 #if defined (HPUX) || defined (convex)
@@ -70,9 +84,12 @@ 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 */
+
 #else /* VMS */
+
 #define WAITTYPE int
 #define WIFSTOPPED(w) 0
 #define WIFSIGNALED(w) 0
@@ -85,4 +102,5 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <iodef.h>
 #include <clidef.h>
 #include "vmsproc.h"
+
 #endif /* VMS */