diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-09-29 08:48:32 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-09-29 08:48:32 +0000 |
| commit | 2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16 (patch) | |
| tree | 4d407d9cf3aaa05d597017bf8c326fda4e960f66 /sysdeps/unix/sysv/linux/sigprocmask.c | |
| parent | f1750fb9c68854778e6e023ed490ff80e1c90167 (diff) | |
| download | glibc-2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16.tar glibc-2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16.tar.gz glibc-2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16.tar.bz2 glibc-2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16.zip | |
Updated to fedora-glibc-20040929T0821
Diffstat (limited to 'sysdeps/unix/sysv/linux/sigprocmask.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sigprocmask.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c index e1b57566a5..1573780d8e 100644 --- a/sysdeps/unix/sysv/linux/sigprocmask.c +++ b/sysdeps/unix/sysv/linux/sigprocmask.c @@ -43,12 +43,20 @@ __sigprocmask (how, set, oset) #ifdef SIGCANCEL sigset_t local_newmask; - /* The only thing we have to make sure here is that SIGCANCEL is not - blocked. */ - if (set != NULL && __builtin_expect (__sigismember (set, SIGCANCEL), 0)) + /* 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 + )) { local_newmask = *set; __sigdelset (&local_newmask, SIGCANCEL); +# ifdef SIGSETXID + __sigdelset (&local_newmask, SIGSETXID); +# endif set = &local_newmask; } #endif |