From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 12 Jul 2012 20:54:43 +0000 (-0400)
Subject: fix redef of sigprocmask constants on mips
X-Git-Tag: v0.9.3~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=90e123f4a810d17c6bd8c2102939f6416481427e;p=oweals%2Fmusl.git

fix redef of sigprocmask constants on mips

this fix is easier than trying to reorder the header stuff
---

diff --git a/arch/mips/bits/signal.h b/arch/mips/bits/signal.h
index a8de0227..f51c29b9 100644
--- a/arch/mips/bits/signal.h
+++ b/arch/mips/bits/signal.h
@@ -27,6 +27,9 @@ typedef struct __ucontext {
 #define SA_RESETHAND  0x80000000
 #define SA_RESTORER   0x04000000
 
+#undef SIG_BLOCK
+#undef SIG_UNBLOCK
+#undef SIG_SETMASK
 #define SIG_BLOCK     1
 #define SIG_UNBLOCK   2
 #define SIG_SETMASK   3
diff --git a/include/signal.h b/include/signal.h
index 72bffd61..d4856a89 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -28,11 +28,9 @@ 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)