diff options
author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-23 03:00:03 +0000 |
---|---|---|
committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-23 03:00:03 +0000 |
commit | cec88156d8107b78c22b988de72e8c1002118d70 (patch) | |
tree | 07788f53223bc1bdc0383468cf9303a3e0b6637b /libpthread/linuxthreads.old/signals.c | |
parent | 0f2c86bee22bc756814129b430b0687c7e23df81 (diff) | |
download | uClibc-alpine-cec88156d8107b78c22b988de72e8c1002118d70.tar.bz2 uClibc-alpine-cec88156d8107b78c22b988de72e8c1002118d70.tar.xz |
Merge from trunk.
Diffstat (limited to 'libpthread/linuxthreads.old/signals.c')
-rw-r--r-- | libpthread/linuxthreads.old/signals.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libpthread/linuxthreads.old/signals.c b/libpthread/linuxthreads.old/signals.c index 0ac858139..23ba9778f 100644 --- a/libpthread/linuxthreads.old/signals.c +++ b/libpthread/linuxthreads.old/signals.c @@ -24,7 +24,7 @@ #include <bits/sigcontextinfo.h> /* mods for uClibc: __libc_sigaction is not in any standard headers */ -extern int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact); +extern __typeof(sigaction) __libc_sigaction; int pthread_sigmask(int how, const sigset_t * newmask, sigset_t * oldmask) { @@ -131,7 +131,8 @@ static void pthread_sighandler_rt(int signo, struct siginfo *si, /* The wrapper around sigaction. Install our own signal handler around the signal. */ -int __sigaction(int sig, const struct sigaction * act, +libpthread_hidden_proto(sigaction) +int sigaction(int sig, const struct sigaction * act, struct sigaction * oact) { struct sigaction newact; @@ -162,7 +163,7 @@ printf(__FUNCTION__": pthreads wrapper!\n"); if (__libc_sigaction(sig, newactp, oact) == -1) return -1; #ifdef DEBUG_PT -printf(__FUNCTION__": signahdler installed, __sigaction successful\n"); +printf(__FUNCTION__": sighandler installed, sigaction successful\n"); #endif if (sig > 0 && sig < NSIG) { @@ -175,7 +176,7 @@ printf(__FUNCTION__": signahdler installed, __sigaction successful\n"); } return 0; } -strong_alias(__sigaction, sigaction) +libpthread_hidden_def(sigaction) /* A signal handler that does nothing */ static void pthread_null_sighandler(int sig attribute_unused) { } @@ -236,6 +237,7 @@ int sigwait(const sigset_t * set, int * sig) /* Redefine raise() to send signal to calling thread only, as per POSIX 1003.1c */ +libpthread_hidden_proto(raise) int raise (int sig) { int retcode = pthread_kill(pthread_self(), sig); @@ -246,3 +248,4 @@ int raise (int sig) return -1; } } +libpthread_hidden_def(raise) |