lread.c (init_lread): Fixing typo HAVE_CARBON test logic

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

diff --git a/src/syswait.h b/src/syswait.h
index 692c202..066f4e5 100644 (file)
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -27,56 +27,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
 #include <sys/types.h>
 
-/* Old code included a comment that HPUX version 7 has broken
-   definitions of some of the macros and `the convex' does too.
-   HAVE_SYS_WAIT_H probably won't be defined on them if they still get
-   used, but for safety...  -- fx */
-#if (defined (HPUX) && !defined (HPUX8)) || defined (convex)
-#undef HAVE_SYS_WAIT_H
-#endif
-
-#if defined HAVE_SYS_WAIT_H    /* We have sys/wait.h with POSIXoid
-                                  definitions. */
-
+#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
-
-#else  /* !HAVE_SYS_WAIT_H */
-
-/* Note that sys/wait.h may still be included by stdlib.h or something
-   according to XPG.  */
-
-#undef WEXITSTATUS
+#ifndef WEXITSTATUS
 #define WEXITSTATUS(status) (((status)  & 0xff00) >> 8)
-#undef WIFEXITED
+#endif
+#ifndef WIFEXITED
 #define WIFEXITED(status) (WTERMSIG(status) == 0)
-#undef WIFSTOPPED
+#endif
+#ifndef WIFSTOPPED
 #define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
-#undef WIFSIGNALED
+#endif
+#ifndef WIFSIGNALED
 #define WIFSIGNALED(status) (!WIFSTOPPED(status) && !WIFEXITED(status))
-#undef WSTOPSIG
+#endif
+#ifndef WSTOPSIG
 #define WSTOPSIG(status) WEXITSTATUS(status)
-#undef WTERMSIG
+#endif
+#ifndef WTERMSIG
 #define WTERMSIG(status) ((status) & 0x7f)
-#undef WCOREDUMP
-#define WCOREDUMP(status) ((status) & 0x80)
-#endif /* HAVE_SYS_WAIT_H */
+#endif
 
 #undef WAITTYPE
 #define WAITTYPE int
 #undef WRETCODE
 #define WRETCODE(status) WEXITSTATUS (status)
 
-#else  /* !1 */
+#else  /* 0 */
 
 #ifndef WAITTYPE
 
@@ -101,7 +90,7 @@ Boston, MA 02111-1307, USA.  */
 #define WCOREDUMP(w) ((w&0200) != 0)
 #endif
 
-#else 
+#else
 
 #ifdef BSD4_1
 #include <wait.h>
@@ -143,7 +132,7 @@ Boston, MA 02111-1307, USA.  */
 #endif /* not WAIT_USE_INT */
 #endif /* no WAITTYPE */
 
-#endif /* 1 */
+#endif /* 0 */
 
 #else /* VMS */
 
@@ -163,3 +152,6 @@ Boston, MA 02111-1307, USA.  */
 #endif /* VMS */
 
 #endif /* EMACS_SYSWAIT_H */
+
+/* arch-tag: 7e5d9719-ec66-4b6f-89bb-563eea16a899
+   (do not change this comment) */