X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fsignal.h;h=242b4ad2b7b73e7d5965ac733cd930d4cc3817b3;hp=860f7428b56200be95f63ea83d4f1b63eaccc72c;hb=8c741783fc96d559cfe79301c924c217b2905c0c;hpb=a8da6c2f287037cbacc65578a268f355760eaf8e

diff --git a/include/signal.h b/include/signal.h
index 860f7428..242b4ad2 100644
--- 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>