--- Net2/sys/signal.h 2018/04/24 18:03:58 1.1.1.1 +++ Net2/sys/signal.h 2018/04/24 18:16:29 1.1.1.3 @@ -30,11 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)signal.h 7.16 (Berkeley) 3/17/91 + * from: @(#)signal.h 7.16 (Berkeley) 3/17/91 + * signal.h,v 1.5 1993/06/16 22:15:06 jtc Exp */ -#ifndef _SIGNAL_H_ -#define _SIGNAL_H_ +#ifndef _SYS_SIGNAL_H_ +#define _SYS_SIGNAL_H_ #define NSIG 32 /* counting 0; could be 33 (mask is 1-32) */ @@ -93,7 +94,9 @@ typedef void (*sig_t) __P((int)); #endif +typedef void (*__sighandler_t) __P((int)); typedef unsigned int sigset_t; +typedef int sig_atomic_t; __BEGIN_DECLS int sigaddset __P((sigset_t *, int)); @@ -113,7 +116,7 @@ __END_DECLS * Signal vector "template" used in sigaction call. */ struct sigaction { - void (*sa_handler)(); /* signal handler */ + __sighandler_t sa_handler; /* signal handler */ sigset_t sa_mask; /* signal mask to apply */ int sa_flags; /* see signal options below */ }; @@ -184,17 +187,18 @@ struct sigcontext { */ #define sigmask(m) (1 << ((m)-1)) -#define BADSIG (void (*)())-1 +#define SIG_ERR ((__sighandler_t) -1) #endif /* _POSIX_SOURCE */ - -#define SIG_DFL (void (*)())0 -#define SIG_IGN (void (*)())1 + +#define SIG_DFL ((__sighandler_t) 0) +#define SIG_IGN ((__sighandler_t) 1) #ifndef KERNEL #include __BEGIN_DECLS -void (*signal __P((int, void (*) __P((int))))) __P((int)); +/*void (*signal __P((int, void (*) __P((int))))) __P((int));*/ +__sighandler_t signal __P((int, __sighandler_t)); int raise __P((int)); #ifndef _ANSI_SOURCE int kill __P((pid_t, int)); @@ -217,4 +221,5 @@ int sigvec __P((int, struct sigvec *, st __END_DECLS #endif /* !KERNEL */ -#endif /* !_SIGNAL_H_ */ + +#endif /* !_SYS_SIGNAL_H_ */