X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/3b7ad313e0d7b351c55cf999474b61cdc18ecad1..f0fe4395ad6f3f3983c9db2bc81a7bccb2689e1b:/src/syswait.h

diff --git a/src/syswait.h b/src/syswait.h
index 089aab9c09..e70e992d54 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -1,5 +1,6 @@
 /* Define wait system call interface for Emacs.
-   Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,14 +16,58 @@ 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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, 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
+
+/* This is now really 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>
+#endif  /* !HAVE_SYS_WAIT_H */
+
+#ifndef WCOREDUMP		/* not POSIX */
+#define WCOREDUMP(status) ((status) & 0x80)
+#endif
+#ifndef WEXITSTATUS
+#define WEXITSTATUS(status) (((status)  & 0xff00) >> 8)
+#endif
+#ifndef WIFEXITED
+#define WIFEXITED(status) (WTERMSIG(status) == 0)
+#endif
+#ifndef WIFSTOPPED
+#define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
+#endif
+#ifndef WIFSIGNALED
+#define WIFSIGNALED(status) (!WIFSTOPPED(status) && !WIFEXITED(status))
+#endif
+#ifndef WSTOPSIG
+#define WSTOPSIG(status) WEXITSTATUS(status)
+#endif
+#ifndef WTERMSIG
+#define WTERMSIG(status) ((status) & 0x7f)
+#endif
+
+#undef WAITTYPE
+#define WAITTYPE int
+#undef WRETCODE
+#define WRETCODE(status) WEXITSTATUS (status)
+
+#else  /* 0 */
+
 #ifndef WAITTYPE
 
 #ifdef WAIT_USE_INT
@@ -34,19 +79,19 @@ Boston, MA 02111-1307, USA.  */
 
 #else /* not WAIT_USE_INT */
 
-#if (!defined (BSD) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER)) || defined (LINUX)
+#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 
+#else
 
 #ifdef BSD4_1
 #include <wait.h>
@@ -84,10 +129,12 @@ Boston, MA 02111-1307, 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 /* 0 */
+
 #else /* VMS */
 
 #define WAITTYPE int
@@ -104,3 +151,8 @@ Boston, MA 02111-1307, USA.  */
 #include "vmsproc.h"
 
 #endif /* VMS */
+
+#endif /* EMACS_SYSWAIT_H */
+
+/* arch-tag: 7e5d9719-ec66-4b6f-89bb-563eea16a899
+   (do not change this comment) */