From 29a766d2d4f40dba73385bb4f0685683c736f87c Mon Sep 17 00:00:00 2001 From: Michael Meissner Date: Thu, 21 Dec 1995 19:51:55 +0000 Subject: [PATCH] Add ifndef wrappers --- include/ChangeLog | 5 ++--- include/wait.h | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 88ec03d3189..bbd619bac81 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,7 +1,6 @@ -Tue Nov 7 14:38:45 1995 Kim Knuttila +Thu Dec 21 14:47:17 1995 Michael Meissner - * 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 diff --git a/include/wait.h b/include/wait.h index a72943cd9ee..fa3c9ccb1d7 100644 --- a/include/wait.h +++ b/include/wait.h @@ -10,8 +10,15 @@ 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 + -- 2.30.2