Convert SYSV IPC to new-style options. (I hope I got everything...)

The LKMs will need an extra file, to come later.

6 files changed, 15 insertions, 8 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 4d449e5..3eeda1b 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,9 +2,10 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.20 1995/12/15 04:36:01 peter Exp 
+ * created from	Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp 
  */
 
+#include "opt_sysvipc.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index cade8e5..6fe5479 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -28,9 +28,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.29 1995/12/09 04:29:11 peter Exp $
+ *	$Id: kern_exec.c,v 1.30 1995/12/14 08:31:20 phk Exp $
  */
 
+#include "opt_sysvipc.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 3a9f61c..8e866e2 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.23 1996/01/01 12:23:39 peter Exp $
+ * $Id: kern_exit.c,v 1.24 1996/01/03 21:42:00 wollman Exp $
  */
 
 #include "opt_ktrace.h"
+#include "opt_sysvipc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index 605065d..b99f78a 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.2 (Berkeley) 1/21/94
- * $Id: param.c,v 1.12 1995/07/29 11:38:39 bde Exp $
+ * $Id: param.c,v 1.13 1995/12/10 13:44:55 phk Exp $
  */
 
+#include "opt_sysvipc.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -57,10 +59,10 @@
 #include <sys/shm.h>
 #endif
 #ifdef SYSVSEM
-#include "sys/sem.h"
+#include <sys/sem.h>
 #endif
 #ifdef SYSVMSG
-#include "sys/msg.h"
+#include <sys/msg.h>
 #endif
 
 /*
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 8b76ff7..33a74c0 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	Id: syscalls.master,v 1.20 1995/12/15 04:36:01 peter Exp 
+ * created from	Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp 
  */
 
 char *syscallnames[] = {
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index a97de86..a472e3a 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.20 1995/12/15 04:36:01 peter Exp $
+	$Id: syscalls.master,v 1.21 1996/01/03 21:42:20 wollman Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
@@ -24,6 +24,7 @@
 
 ; #ifdef's, etc. may be included, and are copied to the output files.
 
+#include "opt_sysvipc.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mount.h>