3 files changed, 3 insertions, 88 deletions

diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index a8b1fb6361b8..4d4dc921e154 100644
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -2,7 +2,7 @@
  * System call hiders.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp 
+ * created from	Id: syscalls.master,v 1.23 1996/01/08 04:13:25 peter Exp 
  */
 
 HIDE_POSIX(fork)
@@ -163,19 +163,9 @@ HIDE_BSD(setdomainname)
 HIDE_BSD(uname)
 HIDE_BSD(sysarch)
 HIDE_BSD(rtprio)
-#ifdef SYSVSEM
 HIDE_BSD(semsys)
-#else
-#endif
-#ifdef SYSVMSG
 HIDE_BSD(msgsys)
-#else
-#endif
-#ifdef SYSVSHM
 HIDE_BSD(shmsys)
-#else
-HIDE_BSD(nosys)
-#endif
 HIDE_BSD(ntp_adjtime)
 HIDE_POSIX(setgid)
 HIDE_BSD(setegid)
@@ -206,36 +196,15 @@ HIDE_BSD(ftruncate)
 HIDE_BSD(__sysctl)
 HIDE_BSD(mlock)
 HIDE_BSD(munlock)
-#ifdef SYSVSEM
 HIDE_BSD(__semctl)
 HIDE_BSD(semget)
 HIDE_BSD(semop)
 HIDE_BSD(semconfig)
-#else
-HIDE_BSD(semctl)
-HIDE_BSD(semget)
-HIDE_BSD(semop)
-HIDE_BSD(semconfig)
-#endif
-#ifdef SYSVMSG
 HIDE_BSD(msgctl)
 HIDE_BSD(msgget)
 HIDE_BSD(msgsnd)
 HIDE_BSD(msgrcv)
-#else
-HIDE_BSD(msgctl)
-HIDE_BSD(msgget)
-HIDE_BSD(msgsnd)
-HIDE_BSD(msgrcv)
-#endif
-#ifdef SYSVSHM
 HIDE_BSD(shmat)
 HIDE_BSD(shmctl)
 HIDE_BSD(shmdt)
 HIDE_BSD(shmget)
-#else
-HIDE_BSD(shmat)
-HIDE_BSD(shmctl)
-HIDE_BSD(shmdt)
-HIDE_BSD(shmget)
-#endif
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index d4384d2ae95e..306ded560982 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp 
+ * created from	Id: syscalls.master,v 1.23 1996/01/08 04:13:25 peter Exp 
  */
 
 #define	SYS_syscall	0
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index f6614276384e..26a407e1e1b1 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp 
+ * created from	Id: syscalls.master,v 1.23 1996/01/08 04:13:25 peter Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
@@ -521,7 +521,6 @@ struct	rtprio_args {
 	pid_t pid;
 	struct rtprio * rtp;
 };
-#ifdef SYSVSEM
 struct	semsys_args {
 	int which;
 	int a2;
@@ -529,9 +528,6 @@ struct	semsys_args {
 	int a4;
 	int a5;
 };
-#else
-#endif
-#ifdef SYSVMSG
 struct	msgsys_args {
 	int which;
 	int a2;
@@ -540,17 +536,12 @@ struct	msgsys_args {
 	int a5;
 	int a6;
 };
-#else
-#endif
-#ifdef SYSVSHM
 struct	shmsys_args {
 	int which;
 	int a2;
 	int a3;
 	int a4;
 };
-#else
-#endif
 struct	ntp_adjtime_args {
 	struct timex * tp;
 };
@@ -659,7 +650,6 @@ struct	munlock_args {
 	caddr_t addr;
 	size_t len;
 };
-#ifdef SYSVSEM
 struct	__semctl_args {
 	int semid;
 	int semnum;
@@ -679,9 +669,6 @@ struct	semop_args {
 struct	semconfig_args {
 	int flag;
 };
-#else
-#endif
-#ifdef SYSVMSG
 struct	msgctl_args {
 	int msqid;
 	int cmd;
@@ -704,9 +691,6 @@ struct	msgrcv_args {
 	long msgtyp;
 	int msgflg;
 };
-#else
-#endif
-#ifdef SYSVSHM
 struct	shmat_args {
 	int shmid;
 	void * shmaddr;
@@ -725,8 +709,6 @@ struct	shmget_args {
 	int size;
 	int shmflg;
 };
-#else
-#endif
 int	nosys __P((struct proc *, struct nosys_args *, int []));
 __dead void	exit __P((struct proc *, struct rexit_args *, int []));
 int	fork __P((struct proc *, struct fork_args *, int []));
@@ -851,18 +833,9 @@ int	setdomainname __P((struct proc *, struct setdomainname_args *, int []));
 int	uname __P((struct proc *, struct uname_args *, int []));
 int	sysarch __P((struct proc *, struct sysarch_args *, int []));
 int	rtprio __P((struct proc *, struct rtprio_args *, int []));
-#ifdef SYSVSEM
 int	semsys __P((struct proc *, struct semsys_args *, int []));
-#else
-#endif
-#ifdef SYSVMSG
 int	msgsys __P((struct proc *, struct msgsys_args *, int []));
-#else
-#endif
-#ifdef SYSVSHM
 int	shmsys __P((struct proc *, struct shmsys_args *, int []));
-#else
-#endif
 int	ntp_adjtime __P((struct proc *, struct ntp_adjtime_args *, int []));
 int	setgid __P((struct proc *, struct setgid_args *, int []));
 int	setegid __P((struct proc *, struct setegid_args *, int []));
@@ -890,27 +863,18 @@ int	__sysctl __P((struct proc *, struct sysctl_args *, int []));
 int	mlock __P((struct proc *, struct mlock_args *, int []));
 int	munlock __P((struct proc *, struct munlock_args *, int []));
 int	lkmnosys __P((struct proc *, struct nosys_args *, int []));
-#ifdef SYSVSEM
 int	__semctl __P((struct proc *, struct __semctl_args *, int []));
 int	semget __P((struct proc *, struct semget_args *, int []));
 int	semop __P((struct proc *, struct semop_args *, int []));
 int	semconfig __P((struct proc *, struct semconfig_args *, int []));
-#else
-#endif
-#ifdef SYSVMSG
 int	msgctl __P((struct proc *, struct msgctl_args *, int []));
 int	msgget __P((struct proc *, struct msgget_args *, int []));
 int	msgsnd __P((struct proc *, struct msgsnd_args *, int []));
 int	msgrcv __P((struct proc *, struct msgrcv_args *, int []));
-#else
-#endif
-#ifdef SYSVSHM
 int	shmat __P((struct proc *, struct shmat_args *, int []));
 int	shmctl __P((struct proc *, struct shmctl_args *, int []));
 int	shmdt __P((struct proc *, struct shmdt_args *, int []));
 int	shmget __P((struct proc *, struct shmget_args *, int []));
-#else
-#endif
 
 #ifdef COMPAT_43
 
@@ -1034,27 +998,9 @@ struct	ogetdirentries_args {
 #ifdef NFS
 #else
 #endif
-#ifdef SYSVSEM
-#else
-#endif
-#ifdef SYSVMSG
-#else
-#endif
-#ifdef SYSVSHM
-#else
-#endif
 #ifdef LFS
 #else
 #endif
-#ifdef SYSVSEM
-#else
-#endif
-#ifdef SYSVMSG
-#else
-#endif
-#ifdef SYSVSHM
-#else
-#endif
 int	ocreat __P((struct proc *, struct ocreat_args *, int []));
 int	olseek __P((struct proc *, struct olseek_args *, int []));
 int	ostat __P((struct proc *, struct ostat_args *, int []));