X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fsignal.h;h=6f10a11820e64e036e83aab6ef73e3d0002a2a3f;hb=839cc4e6da609a0b24f6cc32b0b11558fd77dd83;hp=860f7428b56200be95f63ea83d4f1b63eaccc72c;hpb=a8da6c2f287037cbacc65578a268f355760eaf8e;p=musl

diff --git a/include/signal.h b/include/signal.h
index 860f7428..6f10a118 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -12,7 +12,6 @@ extern "C" {
  || defined(_BSD_SOURCE)
 
 #ifdef _GNU_SOURCE
-#define __siginfo siginfo
 #define __ucontext ucontext
 #endif
 
@@ -25,7 +24,6 @@ extern "C" {
 #define __NEED_time_t
 #define __NEED_clock_t
 #define __NEED_sigset_t
-#define __NEED_siginfo_t
 
 #include <bits/alltypes.h>
 
@@ -69,6 +67,8 @@ extern "C" {
 #define BUS_ADRALN 1
 #define BUS_ADRERR 2
 #define BUS_OBJERR 3
+#define BUS_MCEERR_AR 4
+#define BUS_MCEERR_AO 5
 
 #define CLD_EXITED 1
 #define CLD_KILLED 2
@@ -77,19 +77,7 @@ extern "C" {
 #define CLD_STOPPED 5
 #define CLD_CONTINUED 6
 
-struct sigaction {
-	union {
-		void (*sa_handler)(int);
-		void (*sa_sigaction)(int, siginfo_t *, void *);
-	} __sa_handler;
-	sigset_t sa_mask;
-	int sa_flags;
-	void (*sa_restorer)(void);	
-};
-#define sa_handler   __sa_handler.sa_handler
-#define sa_sigaction __sa_handler.sa_sigaction
-
-typedef struct {
+typedef struct sigaltstack {
 	void *ss_sp;
 	int ss_flags;
 	size_t ss_size;
@@ -100,10 +88,10 @@ union sigval {
 	void *sival_ptr;
 };
 
-struct __siginfo {
+typedef struct {
 	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;
@@ -120,13 +108,19 @@ struct __siginfo {
 		} __sigchld;
 		struct {
 			void *si_addr;
+			short si_addr_lsb;
 		} __sigfault;
 		struct {
 			long si_band;
 			int si_fd;
 		} __sigpoll;
+		struct {
+			void *si_call_addr;
+			int si_syscall;
+			unsigned si_arch;
+		} __sigsys;
 	} __si_fields;
-};
+} siginfo_t;
 #define si_pid     __si_fields.__sigchld.si_pid
 #define si_uid     __si_fields.__sigchld.si_uid
 #define si_status  __si_fields.__sigchld.si_status
@@ -134,12 +128,28 @@ struct __siginfo {
 #define si_stime   __si_fields.__sigchld.si_stime
 #define si_value   __si_fields.__rt.si_sigval
 #define si_addr    __si_fields.__sigfault.si_addr
+#define si_addr_lsb __si_fields.__sigfault.si_addr_lsb
 #define si_band    __si_fields.__sigpoll.si_band
 #define si_fd      __si_fields.__sigpoll.si_fd
 #define si_timer1  __si_fields.__timer.si_timer1
 #define si_timer2  __si_fields.__timer.si_timer2
 #define si_ptr     __si_fields.__rt.si_sigval.sival_ptr
 #define si_int     __si_fields.__rt.si_sigval.sival_int
+#define si_call_addr __si_fields.__sigsys.si_call_addr
+#define si_syscall __si_fields.__sigsys.si_syscall
+#define si_arch    __si_fields.__sigsys.si_arch
+
+struct sigaction {
+	union {
+		void (*sa_handler)(int);
+		void (*sa_sigaction)(int, siginfo_t *, void *);
+	} __sa_handler;
+	sigset_t sa_mask;
+	int sa_flags;
+	void (*sa_restorer)(void);
+};
+#define sa_handler   __sa_handler.sa_handler
+#define sa_sigaction __sa_handler.sa_sigaction
 
 struct sigevent {
 	union sigval sigev_value;
@@ -208,7 +218,8 @@ void (*sigset(int, void (*)(int)))(int);
 #define SIGSTKSZ 8192
 #endif
 
-#ifdef _BSD_SOURCE
+#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define NSIG _NSIG
 typedef void (*sig_t)(int);
 #endif
 
@@ -216,9 +227,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>