From 4fc227fe7628aef36ee508df79aa62b0589f1c12 Mon Sep 17 00:00:00 2001
From: Jeffrey Hsu <hsu@FreeBSD.org>
Date: Mon, 11 Mar 1996 02:21:04 +0000
Subject: [PATCH] Merge in Lite2: add function prototypes 		remove
 bogus function prototype for issig()---no such function 		fix
 comment Lite2 changed type of ps_code from int to long.  We change it to
 u_long   to make it consistent w/ its usage in kern_sig.c. Did not accept
 type change to ps_addr field.  Delete it instead as it is   not used
 anywhere. Reviewed by:	davidg & bde

---
 sys/sys/signalvar.h | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index 78bfa9fb1f02..f4bebcc78112 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -30,8 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)signalvar.h	8.3 (Berkeley) 1/4/94
- * $Id: signalvar.h,v 1.9 1996/01/31 12:44:31 davidg Exp $
+ *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
+ * $Id: signalvar.h,v 1.10 1996/03/02 19:38:16 peter Exp $
  */
 
 #ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
@@ -55,8 +55,7 @@ struct	sigacts {
 	int	ps_flags;		/* signal flags, below */
 	struct	sigaltstack ps_sigstk;	/* sp & on stack state variable */
 	int	ps_sig;			/* for core dump/debugger XXX */
-	int	ps_code;		/* for core dump/debugger XXX */
-	int	ps_addr;		/* for core dump/debugger XXX */
+	u_long	ps_code;		/* for core dump/debugger XXX */
 	sigset_t ps_usertramp;		/* SunOS compat; libc sigtramp XXX */
 	sigset_t ps_nodefer;		/* signals not to defer */
 	sigset_t ps_sigreset;		/* signals that reset when caught */
@@ -78,12 +77,12 @@ struct	sigacts {
 /*
  * Determine signal that should be delivered to process p, the current
  * process, 0 if none.  If there is a pending stop signal with default
- * action, the process stops in issig().
+ * action, the process stops in issignal().
  */
 #define	CURSIG(p)							\
 	(((p)->p_siglist == 0 ||					\
 	    (((p)->p_flag & P_TRACED) == 0 &&				\
-	    ((p)->p_siglist & ~(p)->p_sigmask) == 0)) ?			\
+	     ((p)->p_siglist & ~(p)->p_sigmask) == 0)) ?		\
 	    0 : issignal(p))
 
 /*
@@ -154,20 +153,19 @@ static int sigprop[NSIG + 1] = {
  */
 void	execsigs __P((struct proc *p));
 void	gsignal __P((int pgid, int sig));
-int	issig __P((struct proc *p));
 int	issignal __P((struct proc *p));
-void	killproc __P((struct proc *, char *));
+void	killproc __P((struct proc *p, char *why));
 void	pgsignal __P((struct pgrp *pgrp, int sig, int checkctty));
 void	postsig __P((int sig));
 void	psignal __P((struct proc *p, int sig));
-void	setsigvec __P((struct proc *, int, struct sigaction *));
-void	sigexit	__P((struct proc *, int));
+void	setsigvec __P((struct proc *p, int signum, struct sigaction *sa));
+void	sigexit __P((struct proc *p, int signum));
 void	siginit __P((struct proc *p));
-void	trapsignal __P((struct proc *p, int sig, unsigned code));
+void	trapsignal __P((struct proc *p, int sig, u_long code));
 
 /*
  * Machine-dependent functions:
  */
-void	sendsig __P((sig_t action, int sig, int returnmask, unsigned code));
+void	sendsig __P((sig_t action, int sig, int returnmask, u_long code));
 #endif	/* KERNEL */
 #endif	/* !_SYS_SIGNALVAR_H_ */