make COMPAT_OSF1 compile again

4 files changed, 13 insertions, 12 deletions

diff --git a/sys/compat/osf1/osf1_misc.c b/sys/compat/osf1/osf1_misc.c
index f19e0594ea8..eeb54e9c4cd 100644
--- a/sys/compat/osf1/osf1_misc.c
+++ b/sys/compat/osf1/osf1_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osf1_misc.c,v 1.8 1996/10/30 16:37:19 niklas Exp $	*/
+/*	$OpenBSD: osf1_misc.c,v 1.9 1998/02/17 01:48:07 millert Exp $	*/
 /*	$NetBSD: osf1_misc.c,v 1.7 1995/10/07 06:53:04 mycroft Exp $	*/
 
 /*
@@ -609,10 +609,10 @@ osf1_sys_sendto(p, v, retval)
 {
 	register struct osf1_sys_sendto_args /* {
 		syscallarg(int) s;
-		syscallarg(caddr_t) buf;
+		syscallarg(const void *) buf;
 		syscallarg(size_t) len;
 		syscallarg(int) flags;
-		syscallarg(caddr_t) to;
+		syscallarg(const struct sockaddr *) to;
 		syscallarg(int) tolen;
 	} */ *uap = v;
 	struct sys_sendto_args a;
diff --git a/sys/compat/osf1/osf1_signal.c b/sys/compat/osf1/osf1_signal.c
index d1f80b89950..cd937c3de70 100644
--- a/sys/compat/osf1/osf1_signal.c
+++ b/sys/compat/osf1/osf1_signal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osf1_signal.c,v 1.5 1997/09/15 06:09:58 millert Exp $	*/
+/*	$OpenBSD: osf1_signal.c,v 1.6 1998/02/17 01:48:07 millert Exp $	*/
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -146,7 +146,7 @@ osf1_to_bsd_sigaction(osa, bsa)
 	struct sigaction *bsa;
 {
 
-	bsa->sa_handler = osa->sa_handler;
+	bsa->sa_handler = osa->sa__handler;
 	osf1_to_bsd_sigset(&osa->sa_mask, &bsa->sa_mask);
 	bsa->sa_flags = 0;
 	if ((osa->sa_flags & OSF1_SA_ONSTACK) != 0)
@@ -171,7 +171,7 @@ bsd_to_osf1_sigaction(bsa, osa)
 	struct osf1_sigaction *osa;
 {
 
-	osa->sa_handler = bsa->sa_handler;
+	osa->sa__handler = bsa->sa_handler;
 	bsd_to_osf1_sigset(&bsa->sa_mask, &osa->sa_mask);
 	osa->sa_flags = 0;
 	if ((bsa->sa_flags & SA_ONSTACK) != 0)
diff --git a/sys/compat/osf1/osf1_signal.h b/sys/compat/osf1/osf1_signal.h
index 5c4e7337f63..08183d59579 100644
--- a/sys/compat/osf1/osf1_signal.h
+++ b/sys/compat/osf1/osf1_signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osf1_signal.h,v 1.2 1996/08/02 20:35:27 niklas Exp $	*/
+/*	$OpenBSD: osf1_signal.h,v 1.3 1998/02/17 01:48:08 millert Exp $	*/
 
 #ifndef _OSF1_SIGNAL_H
 #define _OSF1_SIGNAL_H
@@ -49,7 +49,7 @@ typedef u_long	osf1_sigset_t;
 typedef void	(*osf1_handler_t) __P((int));
 
 struct osf1_sigaction {
-	osf1_handler_t	sa_handler;
+	osf1_handler_t	sa__handler;
 	osf1_sigset_t	sa_mask;
 	int		sa_flags;
 };
@@ -73,7 +73,7 @@ struct osf1_sigaltstack {
 #define OSF1_SS_ONSTACK		0x00000001
 #define	OSF1_SS_DISABLE		0x00000002
 
-extern int osf1_to_linux_sig[];
+extern int osf1_to_bsd_sig[];
 void bsd_to_osf1_sigaltstack __P((const struct sigaltstack *, struct osf1_sigaltstack *));
 void bsd_to_osf1_sigset __P((const sigset_t *, osf1_sigset_t *));
 void osf1_to_bsd_sigaltstack __P((const struct osf1_sigaltstack *, struct sigaltstack *));
diff --git a/sys/compat/osf1/syscalls.master b/sys/compat/osf1/syscalls.master
index 9580b422182..27726a49fdb 100644
--- a/sys/compat/osf1/syscalls.master
+++ b/sys/compat/osf1/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.4 1997/01/26 23:05:12 downsj Exp $
+	$OpenBSD: syscalls.master,v 1.5 1998/02/17 01:48:07 millert Exp $
 ;	$NetBSD: syscalls.master,v 1.2 1995/10/07 06:27:28 mycroft Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -201,8 +201,9 @@
 130	STD		{ int osf1_sys_ftruncate(int fd, off_t length); }
 131	UNIMPL		flock
 132	STD		{ int osf1_sys_setgid(gid_t gid); }
-133	STD		{ int osf1_sys_sendto(int s, caddr_t buf, size_t len, \
-			    int flags, caddr_t to, int tolen); }
+133	STD		{ int osf1_sys_sendto(int s, const void *buf, \
+			    size_t len, int flags, const struct sockaddr *to, \
+			    int tolen); }
 134	NOARGS		{ int sys_shutdown(int s, int how); }
 135	UNIMPL		socketpair
 136	NOARGS		{ int sys_mkdir(char *path, int mode); }