add nonstandard timespec/timeval conversion macros in sys/time.h

[musl] / include / signal.h

diff --git a/include/signal.h b/include/signal.h
index 2c3602d..8ef5ff1 100644 (file)
--- 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