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/sigwaitinfo.c | |
| parent | f1750fb9c68854778e6e023ed490ff80e1c90167 (diff) | |
| download | glibc-2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16.tar.gz glibc-2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16.tar.xz glibc-2b13f2ccc0b53bb2f3a4f6dcc006d4dea7149e16.zip | |
Updated to fedora-glibc-20040929T0821
Diffstat (limited to 'sysdeps/unix/sysv/linux/sigwaitinfo.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sigwaitinfo.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/sigwaitinfo.c b/sysdeps/unix/sysv/linux/sigwaitinfo.c index a2dec820fc..a51a01f20b 100644 --- a/sysdeps/unix/sysv/linux/sigwaitinfo.c +++ b/sysdeps/unix/sysv/linux/sigwaitinfo.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1997,1998,2000,2002,2003,2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -33,12 +33,20 @@ do_sigwaitinfo (const sigset_t *set, siginfo_t *info) { #ifdef SIGCANCEL sigset_t tmpset; - if (set != NULL && __sigismember (set, SIGCANCEL)) + if (set != NULL + && (__builtin_expect (__sigismember (set, SIGCANCEL), 0) +# ifdef SIGSETXID + || __builtin_expect (__sigismember (set, SIGSETXID), 0) +# endif + )) { /* Create a temporary mask without the bit for SIGCANCEL set. */ // We are not copying more than we have to. memcpy (&tmpset, set, _NSIG / 8); __sigdelset (&tmpset, SIGCANCEL); +# ifdef SIGSETXID + __sigdelset (&tmpset, SIGSETXID); +# endif set = &tmpset; } #endif |