diff options
| -rw-r--r-- | include/signal.h | 1 | ||||
| -rw-r--r-- | libc/signal/sigwait.c | 11 | ||||
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c | 8 |
3 files changed, 7 insertions, 13 deletions
diff --git a/include/signal.h b/include/signal.h index d10463068..f72707950 100644 --- a/include/signal.h +++ b/include/signal.h @@ -303,7 +303,6 @@ extern int sigpending (sigset_t *__set) __THROW __nonnull ((1)); __THROW. */ extern int sigwait (__const sigset_t *__restrict __set, int *__restrict __sig) __nonnull ((1, 2)); -libc_hidden_proto(sigwait) # if defined __USE_POSIX199309 && defined __UCLIBC_HAS_REALTIME__ /* Select any of pending signals from SET and place information in INFO. diff --git a/libc/signal/sigwait.c b/libc/signal/sigwait.c index 2cdc3acac..6bca1b1e5 100644 --- a/libc/signal/sigwait.c +++ b/libc/signal/sigwait.c @@ -24,8 +24,7 @@ #if defined __UCLIBC_HAS_REALTIME__ -int __sigwait (const sigset_t *set, int *sig) attribute_hidden; -int __sigwait (const sigset_t *set, int *sig) +int sigwait(const sigset_t *set, int *sig) { int ret = sigwaitinfo(set, NULL); if (ret != -1) { @@ -34,16 +33,18 @@ int __sigwait (const sigset_t *set, int *sig) } return 1; } + #else /* __UCLIBC_HAS_REALTIME__ */ /* variant without REALTIME extensions */ static smallint was_sig; /* obviously not thread-safe */ + static void ignore_signal(int sig) { was_sig = sig; } -int __sigwait (const sigset_t *set, int *sig) attribute_hidden; -int __sigwait (const sigset_t *set, int *sig) + +int sigwait (const sigset_t *set, int *sig) { sigset_t tmp_mask; struct sigaction saved[NSIG]; @@ -94,5 +95,3 @@ int __sigwait (const sigset_t *set, int *sig) return was_sig == -1 ? -1 : 0; } #endif /* __UCLIBC_HAS_REALTIME__ */ -weak_alias(__sigwait,sigwait) -libc_hidden_def(sigwait) diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c index 9bacb1360..859cad5ef 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c @@ -68,9 +68,7 @@ weak_extern (__pthread_sigwait) #endif int -__sigwait (set, sig) - const sigset_t *set; - int *sig; +sigwait (const sigset_t *set, int *sig) { #ifndef NOT_IN_libc return __libc_maybe_call2 (pthread_sigwait, (set, sig), @@ -79,9 +77,7 @@ __sigwait (set, sig) return do_sigwait (set, sig); #endif } -libc_hidden_def (__sigwait) -weak_alias (__sigwait, sigwait) -strong_alias (__sigwait, __libc_sigwait) +strong_alias(sigwait, __libc_sigwait) /* Cancellation is handled in __pthread_sigwait. */ LIBC_CANCEL_HANDLED (); |