From fb371ccef02633eadb37dd3876e8c7cb67e07b12 Mon Sep 17 00:00:00 2001 From: christos Date: Wed, 10 May 1995 16:52:53 +0000 Subject: [PATCH] tty_tb.c: need to include ioctl_compat.h in order to compile. sysv_shm.c: make shm_find_segment_by_shmid global so it can be used by COMPAT_HPUX. There should be a better way... rest: Add #ifdef COMPAT_HPUX where needed --- sys/kern/kern_prot.c | 7 ++++--- sys/kern/kern_resource.c | 7 ++++--- sys/kern/sysv_shm.c | 6 +++--- sys/kern/tty_tb.c | 3 ++- sys/kern/uipc_syscalls.c | 5 +++-- sys/kern/vfs_syscalls.c | 11 ++++++----- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 6e216beb369a..0d59de9cde46 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_prot.c,v 1.25 1995/03/09 12:05:43 mycroft Exp $ */ +/* $NetBSD: kern_prot.c,v 1.26 1995/05/10 16:52:53 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1990, 1991, 1993 @@ -384,7 +384,8 @@ setgroups(p, uap, retval) return (0); } -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_LINUX) +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_LINUX) || \ + defined(COMPAT_HPUX) /* ARGSUSED */ compat_43_setreuid(p, uap, retval) register struct proc *p; @@ -452,7 +453,7 @@ compat_43_setregid(p, uap, retval) SCARG(&sgidargs, gid) = SCARG(uap, rgid); /* N, N and N, M */ return (setgid(p, &sgidargs, retval)); } -#endif /* COMPAT_43 || COMPAT_SUNOS || COMPAT_LINUX */ +#endif /* COMPAT_43 || COMPAT_SUNOS || COMPAT_LINUX || COMPAT_HPUX */ /* * Check if gid is a member of the group set. diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index f013a5ef75bd..1182baedd960 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_resource.c,v 1.27 1995/03/21 13:33:51 mycroft Exp $ */ +/* $NetBSD: kern_resource.c,v 1.28 1995/05/10 16:52:57 christos Exp $ */ /*- * Copyright (c) 1982, 1986, 1991, 1993 @@ -199,7 +199,7 @@ donice(curp, chgp, n) } #if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_SVR4) \ - || defined(COMPAT_LINUX) + || defined(COMPAT_LINUX) || defined(COMPAT_HPUX) /* ARGSUSED */ int compat_43_setrlimit(p, uap, retval) @@ -245,7 +245,8 @@ compat_43_getrlimit(p, uap, retval) return (copyout((caddr_t)&olim, (caddr_t)SCARG(uap, rlp), sizeof(olim))); } -#endif /* COMPAT_43 || COMPAT_SUNOS || COMPAT_SVR4 || COMPAT_LINUX */ +#endif /* COMPAT_43 || COMPAT_SUNOS || COMPAT_SVR4 || COMPAT_LINUX || + COMPAT_HPUX */ /* ARGSUSED */ int diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index a50c8c699ec9..7bf3d5453a65 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysv_shm.c,v 1.27 1994/12/22 13:30:40 cgd Exp $ */ +/* $NetBSD: sysv_shm.c,v 1.28 1995/05/10 16:53:00 christos Exp $ */ /* * Copyright (c) 1994 Adam Glass and Charles Hannum. All rights reserved. @@ -82,7 +82,7 @@ struct shmmap_state { static void shm_deallocate_segment __P((struct shmid_ds *)); static int shm_find_segment_by_key __P((key_t)); -static struct shmid_ds *shm_find_segment_by_shmid __P((int)); +struct shmid_ds *shm_find_segment_by_shmid __P((int)); static int shm_delete_mapping __P((struct proc *, struct shmmap_state *)); static int @@ -98,7 +98,7 @@ shm_find_segment_by_key(key) return -1; } -static struct shmid_ds * +struct shmid_ds * shm_find_segment_by_shmid(shmid) int shmid; { diff --git a/sys/kern/tty_tb.c b/sys/kern/tty_tb.c index 525655e9dd0d..74e8183f900e 100644 --- a/sys/kern/tty_tb.c +++ b/sys/kern/tty_tb.c @@ -1,4 +1,4 @@ -/* $NetBSD: tty_tb.c,v 1.16 1994/12/13 20:03:13 mycroft Exp $ */ +/* $NetBSD: tty_tb.c,v 1.17 1995/05/10 16:53:02 christos Exp $ */ /*- * Copyright (c) 1982, 1986, 1991, 1993 @@ -44,6 +44,7 @@ #include #include #include +#include #include #include diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index a44acd4d6075..6c4e91c4c75f 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_syscalls.c,v 1.11 1995/03/05 08:52:21 fvdl Exp $ */ +/* $NetBSD: uipc_syscalls.c,v 1.12 1995/05/10 16:53:05 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1990, 1993 @@ -56,7 +56,8 @@ /* * System call interface to the socket abstraction. */ -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_LINUX) +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_LINUX) || \ + defined(COMPAT_HPUX) #define COMPAT_OLDSOCK #endif diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index e0c6f4c81c98..856fe0e0d31d 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_syscalls.c,v 1.51 1995/03/09 12:05:45 mycroft Exp $ */ +/* $NetBSD: vfs_syscalls.c,v 1.52 1995/05/10 16:53:08 christos Exp $ */ /* * Copyright (c) 1989, 1993 @@ -1129,8 +1129,8 @@ lseek(p, uap, retval) return (0); } -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_SVR4) \ - || defined (COMPAT_LINUX) +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_SVR4) || \ + defined (COMPAT_LINUX) || defined(COMPAT_HPUX) /* * Reposition read/write file offset. */ @@ -1159,7 +1159,7 @@ compat_43_lseek(p, uap, retval) *(long *)retval = qret; return (error); } -#endif /* COMPAT_43 || COMPAT_SUNOS || COMPAT_SVR4 || COMPAT_LINUX */ +#endif /* COMPAT_43 || COMPAT_SUNOS || COMPAT_SVR4 || COMPAT_LINUX || COMPAT_HPUX */ /* * Check access permissions. @@ -1800,7 +1800,8 @@ ftruncate(p, uap, retval) return (error); } -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_LINUX) +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_LINUX) || \ + defined(COMPAT_HPUX) /* * Truncate a file given its path name. */