*** empty log message ***

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

diff --git a/src/syswait.h b/src/syswait.h
index d3edfdf..e70e992 100644 (file)
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -1,5 +1,6 @@
 /* Define wait system call interface for Emacs.
-   Copyright (C) 1993, 1994, 1995, 2000 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,8 +16,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, 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.
@@ -27,59 +28,45 @@ Boston, MA 02111-1307, USA.  */
 
 #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.  */
+/* 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
-#undef WAITTYPE
-#define WAITTYPE int
-#define WRETCODE(w) WEXITSTATUS (w)
-
 #include <sys/types.h>
-#if HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
 
-#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 /* HPUX || convex */
+#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(stat_val) ((unsigned)(stat_val) >> 8)
+#define WEXITSTATUS(status) (((status)  & 0xff00) >> 8)
 #endif
 #ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#define WIFEXITED(status) (WTERMSIG(status) == 0)
 #endif
 #ifndef WIFSTOPPED
-#define WIFSTOPPED(w) ((w&0377) == 0177)
+#define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
 #endif
 #ifndef WIFSIGNALED
-#define WIFSIGNALED(w) ((w&0377) != 0177 && (w&~0377) == 0)
-#endif
-#ifndef WIFEXITED
-#define WIFEXITED(w) ((w&0377) == 0)
-#endif
-#ifndef WRETCODE
-#define WRETCODE(w) (w >> 8)
+#define WIFSIGNALED(status) (!WIFSTOPPED(status) && !WIFEXITED(status))
 #endif
 #ifndef WSTOPSIG
-#define WSTOPSIG(w) (w >> 8)
+#define WSTOPSIG(status) WEXITSTATUS(status)
 #endif
 #ifndef WTERMSIG
-#define WTERMSIG(w) (w & 0377)
-#endif
-#ifndef WCOREDUMP
-#define WCOREDUMP(w) ((w&0200) != 0)
+#define WTERMSIG(status) ((status) & 0x7f)
 #endif
 
-#else  /* !1 */
+#undef WAITTYPE
+#define WAITTYPE int
+#undef WRETCODE
+#define WRETCODE(status) WEXITSTATUS (status)
+
+#else  /* 0 */
 
 #ifndef WAITTYPE
 
@@ -99,12 +86,12 @@ Boston, MA 02111-1307, USA.  */
 #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>
@@ -146,7 +133,7 @@ Boston, MA 02111-1307, USA.  */
 #endif /* not WAIT_USE_INT */
 #endif /* no WAITTYPE */
 
-#endif /* 1 */
+#endif /* 0 */
 
 #else /* VMS */
 
@@ -166,3 +153,6 @@ Boston, MA 02111-1307, USA.  */
 #endif /* VMS */
 
 #endif /* EMACS_SYSWAIT_H */
+
+/* arch-tag: 7e5d9719-ec66-4b6f-89bb-563eea16a899
+   (do not change this comment) */