From 6f7dc709ed7e403af224b0fbb91e9619629eb2ec Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 14 Jan 2006 19:45:02 +0000 Subject: make DODEBUG=y happy, update sysdeps/common/* copyright --- libc/signal/sigaddset.c | 2 +- libc/signal/sigblock.c | 2 +- libc/signal/sigdelset.c | 2 +- libc/signal/sigempty.c | 2 +- libc/signal/sigfillset.c | 3 +-- libc/signal/signal.c | 2 +- libc/signal/sigpause.c | 5 +++-- libc/signal/sigsetmask.c | 2 +- libc/signal/sigwait.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'libc/signal') diff --git a/libc/signal/sigaddset.c b/libc/signal/sigaddset.c index 36d1edc32..83721772c 100644 --- a/libc/signal/sigaddset.c +++ b/libc/signal/sigaddset.c @@ -19,6 +19,7 @@ #include "sigsetops.h" /* Add SIGNO to SET. */ +libc_hidden_proto(sigaddset) int sigaddset (set, signo) sigset_t *set; @@ -32,5 +33,4 @@ sigaddset (set, signo) return __sigaddset (set, signo); } -libc_hidden_proto(sigaddset) libc_hidden_def(sigaddset) diff --git a/libc/signal/sigblock.c b/libc/signal/sigblock.c index 8dd4eebd7..63156804a 100644 --- a/libc/signal/sigblock.c +++ b/libc/signal/sigblock.c @@ -24,6 +24,7 @@ libc_hidden_proto(sigprocmask) #include "sigset-cvt-mask.h" /* Block signals in MASK, returning the old mask. */ +libc_hidden_proto(sigblock) int sigblock (int mask) { sigset_t set, oset; @@ -36,5 +37,4 @@ int sigblock (int mask) return sigset_get_old_mask (&oset); } -libc_hidden_proto(sigblock) libc_hidden_def(sigblock) diff --git a/libc/signal/sigdelset.c b/libc/signal/sigdelset.c index 6fa7241c7..de988a7e8 100644 --- a/libc/signal/sigdelset.c +++ b/libc/signal/sigdelset.c @@ -19,6 +19,7 @@ #include "sigsetops.h" /* Add SIGNO to SET. */ +libc_hidden_proto(sigdelset) int sigdelset (sigset_t *set, int signo) { if (set == NULL || signo <= 0 || signo >= NSIG) @@ -29,5 +30,4 @@ int sigdelset (sigset_t *set, int signo) return __sigdelset (set, signo); } -libc_hidden_proto(sigdelset) libc_hidden_def(sigdelset) diff --git a/libc/signal/sigempty.c b/libc/signal/sigempty.c index 64330a686..e642e9335 100644 --- a/libc/signal/sigempty.c +++ b/libc/signal/sigempty.c @@ -23,6 +23,7 @@ libc_hidden_proto(memset) /* Clear all signals from SET. */ +libc_hidden_proto(sigemptyset) int sigemptyset (set) sigset_t *set; @@ -37,5 +38,4 @@ sigemptyset (set) return 0; } -libc_hidden_proto(sigemptyset) libc_hidden_def(sigemptyset) diff --git a/libc/signal/sigfillset.c b/libc/signal/sigfillset.c index 2f72e8247..83e47937d 100644 --- a/libc/signal/sigfillset.c +++ b/libc/signal/sigfillset.c @@ -21,9 +21,9 @@ #include libc_hidden_proto(memset) -libc_hidden_proto(__sigdelset) /* Set all signals in SET. */ +libc_hidden_proto(sigfillset) int sigfillset (sigset_t *set) { @@ -46,5 +46,4 @@ sigfillset (sigset_t *set) return 0; } -libc_hidden_proto(sigfillset) libc_hidden_def(sigfillset) diff --git a/libc/signal/signal.c b/libc/signal/signal.c index c9ad64387..87bd7ab84 100644 --- a/libc/signal/signal.c +++ b/libc/signal/signal.c @@ -28,7 +28,7 @@ sigset_t _sigintr attribute_hidden; /* Set by siginterrupt. */ /* Set the handler for the signal SIG to HANDLER, returning the old handler, or SIG_ERR on error. */ -__sighandler_t +attribute_hidden __sighandler_t __bsd_signal (int sig, __sighandler_t handler) { struct sigaction act, oact; diff --git a/libc/signal/sigpause.c b/libc/signal/sigpause.c index e5dfc8e01..9f7fb0e76 100644 --- a/libc/signal/sigpause.c +++ b/libc/signal/sigpause.c @@ -17,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#define _BSD_SOURCE #include #include #include /* For NULL. */ @@ -29,6 +30,7 @@ libc_hidden_proto(sigsuspend) /* Set the mask of blocked signals to MASK, wait for a signal to arrive, and then restore the mask. */ +libc_hidden_proto(__sigpause) int __sigpause (int sig_or_mask, int is_sig) { sigset_t set; @@ -46,7 +48,6 @@ int __sigpause (int sig_or_mask, int is_sig) return sigsuspend (&set); } -libc_hidden_proto(__sigpause) libc_hidden_def(__sigpause) #undef sigpause @@ -54,9 +55,9 @@ libc_hidden_def(__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 (mask, 0); } -libc_hidden_proto(sigpause) libc_hidden_def(sigpause) diff --git a/libc/signal/sigsetmask.c b/libc/signal/sigsetmask.c index ea68d3ebb..e524aa108 100644 --- a/libc/signal/sigsetmask.c +++ b/libc/signal/sigsetmask.c @@ -24,6 +24,7 @@ libc_hidden_proto(sigprocmask) #include "sigset-cvt-mask.h" /* Set the mask of blocked signals to MASK, returning the old mask. */ +libc_hidden_proto(sigsetmask) int sigsetmask (int mask) { @@ -38,5 +39,4 @@ sigsetmask (int mask) return sigset_get_old_mask (&oset); } -libc_hidden_proto(sigsetmask) libc_hidden_def(sigsetmask) diff --git a/libc/signal/sigwait.c b/libc/signal/sigwait.c index cd46d2dbe..76321b148 100644 --- a/libc/signal/sigwait.c +++ b/libc/signal/sigwait.c @@ -24,6 +24,7 @@ libc_hidden_proto(sigwaitinfo) +libc_hidden_proto(sigwait) int sigwait (const sigset_t *set, int *sig) { int ret = 1; @@ -33,5 +34,4 @@ int sigwait (const sigset_t *set, int *sig) } return 1; } -libc_hidden_proto(sigwait) libc_hidden_def(sigwait) -- cgit v1.2.3