Add ifndef wrappers

diff --git a/include/ChangeLog b/include/ChangeLog
index 88ec03d3189ac5465ac20bd3d5007e598ef4619e..bbd619bac81ce6768bfc5a42a867e6f8868ac871 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,7 +1,6 @@
-Tue Nov  7 14:38:45 1995  Kim Knuttila  <krk@cygnus.com>
+Thu Dec 21 14:47:17 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
 
-       * coff/powerpc.h (IMAGE_NT_OPTIONAL_HDR_MAGIC): Added define.
-       * coff/pe.h: Added defines for file level flags
+       * wait.h: Protect all macros with #ifndef.
 
 Tue Oct 24 21:45:40 1995  Ian Lance Taylor  <ian@cygnus.com>
 

diff --git a/include/wait.h b/include/wait.h
index a72943cd9ee017060ebd9dd2242f8044c49a3c08..fa3c9ccb1d7e1ce8ad0c6c616f7ec78c762082c2 100644 (file)
--- a/include/wait.h
+++ b/include/wait.h
@@ -10,8 +10,15 @@
    <sys/wait.h> defines, since our code does not use waitpid().  We
    also fail to declare wait() and waitpid().  */   
 
+#ifndef        WIFEXITED
 #define WIFEXITED(w)   (((w)&0377) == 0)
+#endif
+
+#ifndef        WIFSIGNALED
 #define WIFSIGNALED(w) (((w)&0377) != 0177 && ((w)&~0377) == 0)
+#endif
+
+#ifndef        WIFSTOPPED
 #ifdef IBM6000
 
 /* Unfortunately, the above comment (about being compatible in all Unix 
@@ -24,15 +31,33 @@
 #else
 #define WIFSTOPPED(w)  (((w)&0377) == 0177)
 #endif
+#endif
 
+#ifndef        WEXITSTATUS
 #define WEXITSTATUS(w) (((w) >> 8) & 0377) /* same as WRETCODE */
+#endif
+
+#ifndef        WTERMSIG
 #define WTERMSIG(w)    ((w) & 0177)
+#endif
+
+#ifndef        WSTOPSIG
 #define WSTOPSIG       WEXITSTATUS
+#endif
 
 /* These are not defined in POSIX, but are used by our programs.  */
 
 #define WAITTYPE       int
 
+#ifndef        WCOREDUMP
 #define WCOREDUMP(w)   (((w)&0200) != 0)
+#endif
+
+#ifndef        WSETEXIT
 #define WSETEXIT(w,status) ((w) = (0 | ((status) << 8)))
+#endif
+
+#ifndef        WSETSTOP
 #define WSETSTOP(w,sig)           ((w) = (0177 | ((sig) << 8)))
+#endif
+