remove __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS checks in stdint.h

[musl] / include / signal.h

diff --git a/include/signal.h b/include/signal.h
index 860f742..242b4ad 100644 (file)
--- a/include/signal.h
+++ b/include/signal.h
@@ -103,7 +103,7 @@ union sigval {
 struct __siginfo {
        int si_signo, si_errno, si_code;
        union {
-               char __pad[128 - 3*sizeof(int)];
+               char __pad[128 - 2*sizeof(int) - sizeof(long)];
                struct {
                        pid_t si_pid;
                        uid_t si_uid;
@@ -208,7 +208,11 @@ void (*sigset(int, void (*)(int)))(int);
 #define SIGSTKSZ 8192
 #endif
 
-#ifdef _BSD_SOURCE
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+#define NSIG _NSIG
+#endif
+
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
 typedef void (*sig_t)(int);
 #endif
 
@@ -216,9 +220,11 @@ typedef void (*sig_t)(int);
 typedef void (*sighandler_t)(int);
 void (*bsd_signal(int, void (*)(int)))(int);
 int sigisemptyset(const sigset_t *);
+int sigorset (sigset_t *, sigset_t *, sigset_t *);
+int sigandset(sigset_t *, sigset_t *, sigset_t *);
+
 #define SA_NOMASK SA_NODEFER
 #define SA_ONESHOT SA_RESETHAND
-#define NSIG _NSIG
 #endif
 
 #include <bits/signal.h>