cleanup include syntax

SCCS-vsn: sys/sys/ioctl_compat.h 8.3
SCCS-vsn: sys/sys/shm.h 8.4

diff --git a/usr/src/sys/sys/ioctl_compat.h b/usr/src/sys/sys/ioctl_compat.h
index d64947d..dfad4ac 100644 (file)
--- a/usr/src/sys/sys/ioctl_compat.h
+++ b/usr/src/sys/sys/ioctl_compat.h
@@ -4,19 +4,14 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ioctl_compat.h      8.2 (Berkeley) %G%
+ *     @(#)ioctl_compat.h      8.3 (Berkeley) %G%

  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
 #define        _SYS_IOCTL_COMPAT_H_
 
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
 #define        _SYS_IOCTL_COMPAT_H_
 

-#ifdef KERNEL
-#include "ttychars.h"
-#include "ttydev.h"
-#else

 #include <sys/ttychars.h>
 #include <sys/ttydev.h>
 #include <sys/ttychars.h>
 #include <sys/ttydev.h>

-#endif

 
 struct tchars {
        char    t_intrc;        /* interrupt */
 
 struct tchars {
        char    t_intrc;        /* interrupt */

diff --git a/usr/src/sys/sys/shm.h b/usr/src/sys/sys/shm.h
index 93a1b03..e09afb3 100644 (file)
--- a/usr/src/sys/sys/shm.h
+++ b/usr/src/sys/sys/shm.h
@@ -9,7 +9,7 @@
  *
  * %sccs.include.proprietary.c%
  *
  *
  * %sccs.include.proprietary.c%
  *

- *     @(#)shm.h       8.3 (Berkeley) %G%
+ *     @(#)shm.h       8.4 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -18,11 +18,7 @@
 #ifndef _SYS_SHM_H_
 #define _SYS_SHM_H_
 
 #ifndef _SYS_SHM_H_
 #define _SYS_SHM_H_
 

-#ifdef KERNEL
-#include "ipc.h"
-#else

 #include <sys/ipc.h>
 #include <sys/ipc.h>

-#endif

 
 struct shmid_ds {
        struct  ipc_perm shm_perm;      /* operation perms */
 
 struct shmid_ds {
        struct  ipc_perm shm_perm;      /* operation perms */