diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-26 04:33:43 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-26 04:33:43 +0000 |
| commit | 5e01789a9427a97032a19b93b126ca033da7aac8 (patch) | |
| tree | 995848d439a70fd8af21b8e7f78ec008cc7dc8b1 /libc/signal/sigpause.c | |
| parent | 9921832fa13cef31006cfa69bc5574636c36ac0f (diff) | |
| download | uClibc-alpine-5e01789a9427a97032a19b93b126ca033da7aac8.tar.bz2 uClibc-alpine-5e01789a9427a97032a19b93b126ca033da7aac8.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/signal/sigpause.c')
| -rw-r--r-- | libc/signal/sigpause.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/libc/signal/sigpause.c b/libc/signal/sigpause.c index 7e0852dbc..8c99af0a1 100644 --- a/libc/signal/sigpause.c +++ b/libc/signal/sigpause.c @@ -17,25 +17,30 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#define sigdelset __sigdelset_internal -#define sigsuspend __sigsuspend - +#define __UCLIBC_HIDE_DEPRECATED__ +/* psm: need the BSD version of sigpause here */ #include <errno.h> +#define __FAVOR_BSD #include <signal.h> #include <stddef.h> /* For NULL. */ +libc_hidden_proto(sigprocmask) +libc_hidden_proto(sigdelset) +libc_hidden_proto(sigsuspend) + #include "sigset-cvt-mask.h" /* Set the mask of blocked signals to MASK, wait for a signal to arrive, and then restore the mask. */ -int attribute_hidden __sigpause_internal (int sig_or_mask, int is_sig) +libc_hidden_proto(__sigpause) +int __sigpause (int sig_or_mask, int is_sig) { sigset_t set; if (is_sig != 0) { /* The modern X/Open implementation is requested. */ - if (__sigprocmask (0, NULL, &set) < 0 + if (sigprocmask (0, NULL, &set) < 0 /* Yes, we call `sigdelset' and not `__sigdelset'. */ || sigdelset (&set, sig_or_mask) < 0) return -1; @@ -45,14 +50,16 @@ int attribute_hidden __sigpause_internal (int sig_or_mask, int is_sig) return sigsuspend (&set); } -strong_alias(__sigpause_internal,__sigpause) +libc_hidden_def(__sigpause) #undef sigpause /* We have to provide a default version of this function since the standards demand it. The version which is a bit more reasonable is the BSD version. So make this the default. */ +libc_hidden_proto(sigpause) int sigpause (int mask) { - return __sigpause_internal (mask, 0); + return __sigpause (mask, 0); } +libc_hidden_def(sigpause) |