diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-10-21 19:15:11 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-10-21 19:15:11 -0400 |
| commit | 4eb4844b31906e1f8d4a1a1ff7a5c94e1083661f (patch) | |
| tree | 02cd8d75a3e502663de608ebd02880a8557069fd | |
| parent | 31a55f233b313030a787240b76c06f2d08cde29f (diff) | |
| download | musl-4eb4844b31906e1f8d4a1a1ff7a5c94e1083661f.tar.gz | |
fix issues with wait constants in stdlib.h
the W* namespace is not reserved, so the nonstandard ones must be
moved under extension features. also WNOHANG and WUNTRACED were
missing.
| -rw-r--r-- | include/stdlib.h | 9 | ||||
| -rw-r--r-- | include/sys/wait.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/stdlib.h b/include/stdlib.h index f7c59719..2d1505b5 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -86,16 +86,15 @@ size_t wcstombs (char *__restrict, const wchar_t *__restrict, size_t); || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ || defined(_BSD_SOURCE) -#ifndef WEXITSTATUS +#define WNOHANG 1 +#define WUNTRACED 2 + #define WEXITSTATUS(s) (((s) & 0xff00) >> 8) #define WTERMSIG(s) ((s) & 0x7f) #define WSTOPSIG(s) WEXITSTATUS(s) -#define WCOREDUMP(s) ((s) & 0x80) #define WIFEXITED(s) (!WTERMSIG(s)) #define WIFSTOPPED(s) (((s) & 0xff) == 0x7f) #define WIFSIGNALED(s) (((signed char) (((s) & 0x7f) + 1) >> 1) > 0) -#define WIFCONTINUED(s) ((s) == 0xffff) -#endif int posix_memalign (void **, size_t, size_t); int setenv (const char *, const char *, int); @@ -142,6 +141,8 @@ void lcong48 (unsigned short [7]); char *mktemp (char *); void *valloc (size_t); void *memalign(size_t, size_t); +#define WCOREDUMP(s) ((s) & 0x80) +#define WIFCONTINUED(s) ((s) == 0xffff) #endif #ifdef _GNU_SOURCE diff --git a/include/sys/wait.h b/include/sys/wait.h index 8bcac8a3..7b5e8c7b 100644 --- a/include/sys/wait.h +++ b/include/sys/wait.h @@ -37,7 +37,6 @@ pid_t wait4 (pid_t, int *, int, struct rusage *); #define P_PID 1 #define P_PGID 2 -#ifndef WEXITSTATUS #define WEXITSTATUS(s) (((s) & 0xff00) >> 8) #define WTERMSIG(s) ((s) & 0x7f) #define WSTOPSIG(s) WEXITSTATUS(s) @@ -46,7 +45,6 @@ pid_t wait4 (pid_t, int *, int, struct rusage *); #define WIFSTOPPED(s) (((s) & 0xff) == 0x7f) #define WIFSIGNALED(s) (((signed char) (((s) & 0x7f) + 1) >> 1) > 0) #define WIFCONTINUED(s) ((s) == 0xffff) -#endif #ifdef __cplusplus } |