X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fsignal.h;h=8ef5ff1406edc2cb1532b9254f83790409f40d6b;hb=ad87c2eecf70c6f2852a4908b04a6329cbebaf7d;hp=2c3602dfe72a33d565da16e1a39a23bde15c6d28;hpb=b54f169bfd2e1ca39d7e16345195418ec955df4e;p=musl

diff --git a/include/signal.h b/include/signal.h
index 2c3602df..8ef5ff14 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -108,16 +108,16 @@ typedef struct {
 		} __sigchld;
 		struct {
 			void *si_addr;
-			short int si_addr_lsb;
+			short si_addr_lsb;
 		} __sigfault;
 		struct {
 			long si_band;
 			int si_fd;
 		} __sigpoll;
 		struct {
-			unsigned int si_call_addr;
+			void *si_call_addr;
 			int si_syscall;
-			unsigned int si_arch;
+			unsigned si_arch;
 		} __sigsys;
 	} __si_fields;
 } siginfo_t;
@@ -218,11 +218,8 @@ void (*sigset(int, void (*)(int)))(int);
 #define SIGSTKSZ 8192
 #endif
 
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
-#define NSIG _NSIG
-#endif
-
 #if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define NSIG _NSIG
 typedef void (*sig_t)(int);
 #endif
 
@@ -230,8 +227,8 @@ 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 *);
+int sigorset (sigset_t *, const sigset_t *, const sigset_t *);
+int sigandset(sigset_t *, const sigset_t *, const sigset_t *);
 
 #define SA_NOMASK SA_NODEFER
 #define SA_ONESHOT SA_RESETHAND