diff mbox

[1/3] Remove useless #ifdefs from sysdeps/unix/sysv/linux/sigprocmask.c

Message ID 20171016043407.1142-2-ynorov@caviumnetworks.com
State New, archived
Headers

Commit Message

Yury Norov Oct. 16, 2017, 4:34 a.m. UTC 
  The sysdeps/unix/sysv/linux/sigprocmask.c includes nptl-signals.h
via nptl/pthreadP.h, and so SIGCANCEL and SIGSETXID become defined
unconditionally. But later in the code, there are some checks weither
symbols defined, which is useless. This patch removes useless checks.

	* sysdeps/unix/sysv/linux/sigprocmask.c: Remove useless #ifdefs

---
 sysdeps/unix/sysv/linux/sigprocmask.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Comments

Andreas Schwab Oct. 16, 2017, 9:04 a.m. UTC | #1 
On Okt 16 2017, Yury Norov <ynorov@caviumnetworks.com> wrote:

> 	* sysdeps/unix/sysv/linux/sigprocmask.c: Remove useless #ifdefs

Ok.

Andreas.
diff mbox

Patch

diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c
index d0b8e049b2..e776563336 100644
--- a/sysdeps/unix/sysv/linux/sigprocmask.c
+++ b/sysdeps/unix/sysv/linux/sigprocmask.c
@@ -30,26 +30,19 @@ 
 int
 __sigprocmask (int how, const sigset_t *set, sigset_t *oset)
 {
-#ifdef SIGCANCEL
   sigset_t local_newmask;
 
   /* The only thing we have to make sure here is that SIGCANCEL and
      SIGSETXID are not blocked.  */
   if (set != NULL
       && (__builtin_expect (__sigismember (set, SIGCANCEL), 0)
-# ifdef SIGSETXID
-	  || __builtin_expect (__sigismember (set, SIGSETXID), 0)
-# endif
-	  ))
+	  || __builtin_expect (__sigismember (set, SIGSETXID), 0)))
     {
       local_newmask = *set;
       __sigdelset (&local_newmask, SIGCANCEL);
-# ifdef SIGSETXID
       __sigdelset (&local_newmask, SIGSETXID);
-# endif
       set = &local_newmask;
     }
-#endif
 
   return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8);
 }