fix AS-safety of close when aio is in use and fd map is expanded

[musl] / include / sys / wait.h

diff --git a/include/sys/wait.h b/include/sys/wait.h
index a7ad7cd..d4b1f2e 100644 (file)
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -6,8 +6,6 @@ extern "C" {
 
 #include <features.h>
 
-#include <signal.h>
-
 #define __NEED_pid_t
 #define __NEED_id_t
 #include <bits/alltypes.h>
@@ -15,13 +13,20 @@ extern "C" {
 typedef enum {
        P_ALL = 0,
        P_PID = 1,
-       P_PGID = 2
+       P_PGID = 2,
+       P_PIDFD = 3
 } idtype_t;
 
 pid_t wait (int *);
-int waitid (idtype_t, id_t, siginfo_t *, int);
 pid_t waitpid (pid_t, int *, int );
 
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE)
+#include <signal.h>
+int waitid (idtype_t, id_t, siginfo_t *, int);
+#endif
+
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 #include <sys/resource.h>
 pid_t wait3 (int *, int, struct rusage *);
@@ -46,9 +51,16 @@ pid_t wait4 (pid_t, int *, int, struct rusage *);
 #define WCOREDUMP(s) ((s) & 0x80)
 #define WIFEXITED(s) (!WTERMSIG(s))
 #define WIFSTOPPED(s) ((short)((((s)&0xffff)*0x10001)>>8) > 0x7f00)
-#define WIFSIGNALED(s) (((s)&0xffff)-1 < 0xffu)
+#define WIFSIGNALED(s) (((s)&0xffff)-1U < 0xffu)
 #define WIFCONTINUED(s) ((s) == 0xffff)
 
+#if _REDIR_TIME64
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+__REDIR(wait3, __wait3_time64);
+__REDIR(wait4, __wait4_time64);
+#endif
+#endif
+
 #ifdef __cplusplus
 }
 #endif