rework langinfo code for ABI compat and for use by time code

[musl] / include / sys / wait.h

diff --git a/include/sys/wait.h b/include/sys/wait.h
index 8e3d72d..b6dfe01 100644 (file)
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -4,27 +4,50 @@
 extern "C" {
 #endif
 
+#include <features.h>
+
+#include <signal.h>
+
 #define __NEED_pid_t
 #define __NEED_id_t
-#define __NEED_time_t
-#define __NEED_struct_timeval
-#define __NEED_siginfo_t
 #include <bits/alltypes.h>
 
-typedef int idtype_t;
+typedef enum {
+       P_ALL = 0,
+       P_PID = 1,
+       P_PGID = 2
+} idtype_t;
 
 pid_t wait (int *);
 int waitid (idtype_t, id_t, siginfo_t *, int);
 pid_t waitpid (pid_t, int *, int );
 
-#ifdef _GNU_SOURCE
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 #include <sys/resource.h>
 pid_t wait3 (int *, int, struct rusage *);
 pid_t wait4 (pid_t, int *, int, struct rusage *);
 #endif
 
-#include <bits/wait.h>
-#include <bits/wexitstatus.h>
+#define WNOHANG    1
+#define WUNTRACED  2
+
+#define WSTOPPED   2
+#define WEXITED    4
+#define WCONTINUED 8
+#define WNOWAIT    0x1000000
+
+#define __WNOTHREAD 0x20000000
+#define __WALL      0x40000000
+#define __WCLONE    0x80000000
+
+#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)
 
 #ifdef __cplusplus
 }