From d3f9546960f56c05624e2932a899db7f1d38a480 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 27 Jun 2008 04:01:29 +0000 Subject: Sync build machinery stuff from trunk. Some more fixed for mips nptl port --- libpthread/nptl/sysdeps/pthread/sigaction.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'libpthread/nptl/sysdeps/pthread/sigaction.c') diff --git a/libpthread/nptl/sysdeps/pthread/sigaction.c b/libpthread/nptl/sysdeps/pthread/sigaction.c index 54b5d2de4..0877e534f 100644 --- a/libpthread/nptl/sysdeps/pthread/sigaction.c +++ b/libpthread/nptl/sysdeps/pthread/sigaction.c @@ -20,21 +20,20 @@ /* This is tricky. GCC doesn't like #include_next in the primary source file and even if it did, the first #include_next is this exact file anyway. */ -#ifndef LIBC_SIGACTION - #include +#include +#include +#include +extern __typeof(sigaction) __libc_sigaction; +extern __typeof(sigaction) __sigaction; /* We use the libc implementation but we tell it to not allow SIGCANCEL or SIGTIMER to be handled. */ -# define LIBC_SIGACTION 1 - -# include - int -sigaction (int sig, const struct sigaction *act, struct sigaction *oact); - -int -__sigaction (int sig, const struct sigaction *act, struct sigaction *oact) +__sigaction (sig, act, oact) + int sig; + const struct sigaction *act; + struct sigaction *oact; { if (__builtin_expect (sig == SIGCANCEL || sig == SIGSETXID, 0)) { @@ -47,8 +46,3 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact) libc_hidden_proto(sigaction) weak_alias (__sigaction, sigaction) libc_hidden_weak(sigaction) -#else - -# include_next - -#endif /* LIBC_SIGACTION */ -- cgit v1.2.3