From 90e123f4a810d17c6bd8c2102939f6416481427e Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 12 Jul 2012 16:54:43 -0400 Subject: [PATCH] fix redef of sigprocmask constants on mips this fix is easier than trying to reorder the header stuff --- arch/mips/bits/signal.h | 3 +++ include/signal.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) 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)