Update.

	Patch by khendricks@ivey.uwo.ca [libc/1382].

1 files changed, 58 insertions, 56 deletions

diff --git a/signal/signal.h b/signal/signal.h
index 02d7a79c65..12019f06f6 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -62,27 +62,29 @@ typedef __pid_t pid_t;
 
 
 /* Type of a signal handler.  */
-typedef void (*__sighandler_t) __PMT ((int));
+typedef void (*__sighandler_t) (int);
 
 /* The X/Open definition of `signal' specifies the SVID semantic.  Use
    the additional function `sysv_signal' when X/Open compatibility is
    requested.  */
-extern __sighandler_t __sysv_signal __P ((int __sig,
-					  __sighandler_t __handler));
+extern __sighandler_t __sysv_signal (int __sig, __sighandler_t __handler)
+     __THROW;
 #ifdef __USE_GNU
-extern __sighandler_t sysv_signal __P ((int __sig, __sighandler_t __handler));
+extern __sighandler_t sysv_signal (int __sig, __sighandler_t __handler)
+     __THROW;
 #endif
 
 /* Set the handler for the signal SIG to HANDLER, returning the old
    handler, or SIG_ERR on error.
    By default `signal' has the BSD semantic.  */
 #ifdef __USE_BSD
-extern __sighandler_t signal __P ((int __sig, __sighandler_t __handler));
+extern __sighandler_t signal (int __sig, __sighandler_t __handler) __THROW;
 #else
 /* Make sure the used `signal' implementation is the SVID version. */
 # ifdef __REDIRECT
 extern __sighandler_t __REDIRECT (signal,
-				  __P ((int __sig, __sighandler_t __handler)),
+				  (int __sig,
+				   __sighandler_t __handler) __THROW,
 				  __sysv_signal);
 # else
 #  define signal __sysv_signal
@@ -92,35 +94,35 @@ extern __sighandler_t __REDIRECT (signal,
 #ifdef __USE_XOPEN
 /* The X/Open definition of `signal' conflicts with the BSD version.
    So they defined another function `bsd_signal'.  */
-extern __sighandler_t bsd_signal __P ((int __sig, __sighandler_t __handler));
+extern __sighandler_t bsd_signal (int __sig, __sighandler_t __handler) __THROW;
 #endif
 
 /* Send signal SIG to process number PID.  If PID is zero,
    send SIG to all processes in the current process's process group.
    If PID is < -1, send SIG to all processes in process group - PID.  */
 #ifdef __USE_POSIX
-extern int kill __P ((__pid_t __pid, int __sig));
+extern int kill (__pid_t __pid, int __sig) __THROW;
 #endif /* Use POSIX.  */
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
 /* Send SIG to all processes in process group PGRP.
    If PGRP is zero, send SIG to all processes in
    the current process's process group.  */
-extern int killpg __P ((__pid_t __pgrp, int __sig));
+extern int killpg (__pid_t __pgrp, int __sig) __THROW;
 #endif /* Use BSD || X/Open Unix.  */
 
 /* Raise signal SIG, i.e., send SIG to yourself.  */
-extern int raise __P ((int __sig));
+extern int raise (int __sig) __THROW;
 
 #ifdef __USE_SVID
 /* SVID names for the same things.  */
-extern __sighandler_t ssignal __P ((int __sig, __sighandler_t __handler));
-extern int gsignal __P ((int __sig));
+extern __sighandler_t ssignal (int __sig, __sighandler_t __handler) __THROW;
+extern int gsignal (int __sig) __THROW;
 #endif /* Use SVID.  */
 
 #ifdef __USE_MISC
 /* Print a message describing the meaning of the given signal number.  */
-extern void psignal __P ((int __sig, __const char *__s));
+extern void psignal (int __sig, __const char *__s) __THROW;
 #endif /* Use misc.  */
 
 
@@ -129,12 +131,12 @@ extern void psignal __P ((int __sig, __const char *__s));
    the more modern interface in X/Open defines it as the signal
    number.  We go with the BSD version unless the user explicitly
    selects the X/Open version.  */
-extern int __sigpause __P ((int __sig_or_mask, int __is_sig));
+extern int __sigpause (int __sig_or_mask, int __is_sig) __THROW;
 
 #ifdef __USE_BSD
 /* Set the mask of blocked signals to MASK,
    wait for a signal to arrive, and then restore the mask.  */
-extern int sigpause __P ((int __mask));
+extern int sigpause (int __mask) __THROW;
 # define sigpause(mask) __sigpause ((mask), 0)
 #else
 # ifdef __USE_XOPEN
@@ -154,13 +156,13 @@ extern int sigpause __P ((int __mask));
 # define sigmask(sig)	__sigmask(sig)
 
 /* Block signals in MASK, returning the old mask.  */
-extern int sigblock __P ((int __mask));
+extern int sigblock (int __mask) __THROW;
 
 /* Set the mask of blocked signals to MASK, returning the old mask.  */
-extern int sigsetmask __P ((int __mask));
+extern int sigsetmask (int __mask) __THROW;
 
 /* Return currently selected signal mask.  */
-extern int siggetmask __P ((void));
+extern int siggetmask (void) __THROW;
 #endif /* Use BSD.  */
 
 
@@ -189,31 +191,31 @@ typedef __sighandler_t sig_t;
 # endif
 
 /* Clear all signals from SET.  */
-extern int sigemptyset __P ((sigset_t *__set));
+extern int sigemptyset (sigset_t *__set) __THROW;
 
 /* Set all signals in SET.  */
-extern int sigfillset __P ((sigset_t *__set));
+extern int sigfillset (sigset_t *__set) __THROW;
 
 /* Add SIGNO to SET.  */
-extern int sigaddset __P ((sigset_t *__set, int __signo));
+extern int sigaddset (sigset_t *__set, int __signo) __THROW;
 
 /* Remove SIGNO from SET.  */
-extern int sigdelset __P ((sigset_t *__set, int __signo));
+extern int sigdelset (sigset_t *__set, int __signo) __THROW;
 
 /* Return 1 if SIGNO is in SET, 0 if not.  */
-extern int sigismember __P ((__const sigset_t *__set, int __signo));
+extern int sigismember (__const sigset_t *__set, int __signo) __THROW;
 
 # ifdef __USE_GNU
 /* Return non-empty value is SET is not empty.  */
-extern int sigisemptyset __P ((__const sigset_t *__set));
+extern int sigisemptyset (__const sigset_t *__set) __THROW;
 
 /* Build new signal set by combining the two inputs set using logical AND.  */
-extern int sigandset __P ((sigset_t *__set, __const sigset_t *__left,
-			   __const sigset_t *__right));
+extern int sigandset (sigset_t *__set, __const sigset_t *__left,
+		      __const sigset_t *__right) __THROW;
 
 /* Build new signal set by combining the two inputs set using logical OR.  */
-extern int sigorset __P ((sigset_t *__set, __const sigset_t *__left,
-			  __const sigset_t *__right));
+extern int sigorset (sigset_t *__set, __const sigset_t *__left,
+		     __const sigset_t *__right) __THROW;
 # endif /* GNU */
 
 /* Get the system-specific definitions of `struct sigaction'
@@ -221,39 +223,39 @@ extern int sigorset __P ((sigset_t *__set, __const sigset_t *__left,
 # include <bits/sigaction.h>
 
 /* Get and/or change the set of blocked signals.  */
-extern int sigprocmask __P ((int __how,
-			     __const sigset_t *__set, sigset_t *__oset));
+extern int sigprocmask (int __how, __const sigset_t *__set, sigset_t *__oset)
+     __THROW;
 
 /* Change the set of blocked signals to SET,
    wait until a signal arrives, and restore the set of blocked signals.  */
-extern int sigsuspend __P ((__const sigset_t *__set));
+extern int sigsuspend (__const sigset_t *__set) __THROW;
 
 /* Get and/or set the action for signal SIG.  */
-extern int __sigaction __P ((int __sig, __const struct sigaction *__act,
-			     struct sigaction *__oact));
-extern int sigaction __P ((int __sig, __const struct sigaction *__act,
-			   struct sigaction *__oact));
+extern int __sigaction (int __sig, __const struct sigaction *__act,
+			struct sigaction *__oact) __THROW;
+extern int sigaction (int __sig, __const struct sigaction *__act,
+		      struct sigaction *__oact) __THROW;
 
 /* Put in SET all signals that are blocked and waiting to be delivered.  */
-extern int sigpending __P ((sigset_t *__set));
+extern int sigpending (sigset_t *__set) __THROW;
 
 
 /* Select any of pending signals from SET or wait for any to arrive.  */
-extern int sigwait __P ((__const sigset_t *__set, int *__sig));
+extern int sigwait (__const sigset_t *__set, int *__sig) __THROW;
 
 # ifdef __USE_POSIX199309
 /* Select any of pending signals from SET and place information in INFO.  */
-extern int sigwaitinfo __P ((__const sigset_t *__set, siginfo_t *__info));
+extern int sigwaitinfo (__const sigset_t *__set, siginfo_t *__info) __THROW;
 
 /* Select any of pending signals from SET and place information in INFO.
    Wait the imte specified by TIMEOUT if no signal is pending.  */
-extern int sigtimedwait __P ((__const sigset_t *__set, siginfo_t *__info,
-			      __const struct timespec *__timeout));
+extern int sigtimedwait (__const sigset_t *__set, siginfo_t *__info,
+			 __const struct timespec *__timeout) __THROW;
 
 /* Send signal SIG to the process PID.  Associate data in VAL with the
    signal.  */
-extern int sigqueue __P ((__pid_t __pid, int __sig,
-			  __const union sigval __val));
+extern int sigqueue (__pid_t __pid, int __sig, __const union sigval __val)
+     __THROW;
 # endif	/* Use POSIX 199306.  */
 
 #endif /* Use POSIX.  */
@@ -286,15 +288,15 @@ struct sigvec
    If the SV_RESETHAND bit is set in `sv_flags', the handler for SIG will be
    reset to SIG_DFL before `sv_handler' is entered.  If OVEC is non-NULL,
    it is filled in with the old information for SIG.  */
-extern int sigvec __P ((int __sig, __const struct sigvec *__vec,
-			struct sigvec *__ovec));
+extern int sigvec (int __sig, __const struct sigvec *__vec,
+		   struct sigvec *__ovec) __THROW;
 
 
 /* Get machine-dependent `struct sigcontext' and signal subcodes.  */
 # include <bits/sigcontext.h>
 
 /* Restore the state saved in SCP.  */
-extern int sigreturn __P ((struct sigcontext *__scp));
+extern int sigreturn (struct sigcontext *__scp) __THROW;
 
 #endif /*  use BSD.  */
 
@@ -304,20 +306,20 @@ extern int sigreturn __P ((struct sigcontext *__scp));
 /* If INTERRUPT is nonzero, make signal SIG interrupt system calls
    (causing them to fail with EINTR); if INTERRUPT is zero, make system
    calls be restarted after signal SIG.  */
-extern int siginterrupt __P ((int __sig, int __interrupt));
+extern int siginterrupt (int __sig, int __interrupt) __THROW;
 
 # include <bits/sigstack.h>
 
 /* Run signals handlers on the stack specified by SS (if not NULL).
    If OSS is not NULL, it is filled in with the old signal stack status.
    This interface is obsolete and on many platform not implemented.  */
-extern int sigstack __P ((__const struct sigstack *__ss,
-			  struct sigstack *__oss));
+extern int sigstack (__const struct sigstack *__ss,
+		     struct sigstack *__oss) __THROW;
 
 /* Alternate signal handler stack interface.
    This interface should always be preferred over `sigstack'.  */
-extern int sigaltstack __P ((__const struct sigaltstack *__ss,
-			     struct sigaltstack *__oss));
+extern int sigaltstack (__const struct sigaltstack *__ss,
+			struct sigaltstack *__oss) __THROW;
 
 #endif /* use BSD or X/Open Unix.  */
 
@@ -325,16 +327,16 @@ extern int sigaltstack __P ((__const struct sigaltstack *__ss,
 /* Simplified interface for signal management.  */
 
 /* Add SIG to the calling process' signal mask.  */
-extern int sighold __P ((int __sig));
+extern int sighold (int __sig) __THROW;
 
 /* Remove SIG from the calling process' signal mask.  */
-extern int sigrelse __P ((int __sig));
+extern int sigrelse (int __sig) __THROW;
 
 /* Set the disposition of SIG to SIG_IGN.  */
-extern int sigignore __P ((int __sig));
+extern int sigignore (int __sig) __THROW;
 
 /* Set the disposition of SIG.  */
-extern __sighandler_t sigset __P ((int __sig, __sighandler_t __disp));
+extern __sighandler_t sigset (int __sig, __sighandler_t __disp) __THROW;
 
 /* Some of the functions for handling signals in threaded programs must
    be defined here.  */
@@ -345,9 +347,9 @@ extern __sighandler_t sigset __P ((int __sig, __sighandler_t __disp));
    other code which need deep insights.  */
 
 /* Return number of available real-time signal with highest priority.  */
-extern int __libc_current_sigrtmin __P ((void));
+extern int __libc_current_sigrtmin (void) __THROW;
 /* Return number of available real-time signal with lowest priority.  */
-extern int __libc_current_sigrtmax __P ((void));
+extern int __libc_current_sigrtmax (void) __THROW;
 
 #endif /* signal.h  */