about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-07-12 14:21:41 -0400
committerRich Felker <dalias@aerifal.cx>2012-07-12 14:21:41 -0400
commitba8a96b0689943195cb49e7e4ef0de254532d9e2 (patch)
tree4bf76e556d267b05db044131d0628184e30690ac
parentdb11e96493d1a814266104332fa1f53a51622213 (diff)
downloadmusl-ba8a96b0689943195cb49e7e4ef0de254532d9e2.tar.gz
musl-ba8a96b0689943195cb49e7e4ef0de254532d9e2.tar.xz
musl-ba8a96b0689943195cb49e7e4ef0de254532d9e2.zip
more mips bits-header fixes
signal handling was very broken because of this
-rw-r--r--arch/mips/bits/signal.h8
-rw-r--r--include/signal.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/mips/bits/signal.h b/arch/mips/bits/signal.h
index bcc6f5cb..a8de0227 100644
--- a/arch/mips/bits/signal.h
+++ b/arch/mips/bits/signal.h
@@ -19,14 +19,18 @@ typedef struct __ucontext {
 } ucontext_t;
 
 #define SA_NOCLDSTOP  1
-#define SA_NOCLDWAIT  2
-#define SA_SIGINFO    4
+#define SA_NOCLDWAIT  0x10000
+#define SA_SIGINFO    8
 #define SA_ONSTACK    0x08000000
 #define SA_RESTART    0x10000000
 #define SA_NODEFER    0x40000000
 #define SA_RESETHAND  0x80000000
 #define SA_RESTORER   0x04000000
 
+#define SIG_BLOCK     1
+#define SIG_UNBLOCK   2
+#define SIG_SETMASK   3
+
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 struct sigcontext
 {
diff --git a/include/signal.h b/include/signal.h
index d4856a89..72bffd61 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -28,9 +28,11 @@ extern "C" {
 
 #define SIG_HOLD ((void (*)(int)) 2)
 
+#ifndef SIG_BLOCK
 #define SIG_BLOCK     0
 #define SIG_UNBLOCK   1
 #define SIG_SETMASK   2
+#endif
 
 #define SI_ASYNCNL (-60)
 #define SI_TKILL (-6)