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 a8de0227d1bc7859cf76d2c9a149cc99278428c8..f51c29b97b585712d1faa5c228d3aed8df08d288 100644 (file)
--- 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 72bffd611bdcf1cd0713a095cc6cc23d9efa67ba..d4856a890c6b38617045642cb7853626f3720e9f 100644 (file)
--- 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)