Change include paths. No more ../h

SCCS-vsn: sys/sys/user.h 6.6
SCCS-vsn: sys/sys/ioctl.h 6.5
SCCS-vsn: sys/sys/namei.h 6.7
SCCS-vsn: sys/sys/param.h 6.4
SCCS-vsn: sys/sys/tty.h 6.2
SCCS-vsn: sys/sys/vcmd.h 6.2

diff --git a/usr/src/sys/sys/ioctl.h b/usr/src/sys/sys/ioctl.h
index 89b74c5..d945b0c 100644 (file)
--- a/usr/src/sys/sys/ioctl.h
+++ b/usr/src/sys/sys/ioctl.h
@@ -1,12 +1,12 @@
-/*     ioctl.h 6.4     84/08/02        */
+/*     ioctl.h 6.5     84/08/28        */

 /*
  * Ioctl definitions
  */
 #ifndef        _IOCTL_
 #define        _IOCTL_
 #ifdef KERNEL
 /*
  * Ioctl definitions
  */
 #ifndef        _IOCTL_
 #define        _IOCTL_
 #ifdef KERNEL

-#include "../h/ttychars.h"
-#include "../h/ttydev.h"
+#include "ttychars.h"
+#include "ttydev.h"

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

diff --git a/usr/src/sys/sys/namei.h b/usr/src/sys/sys/namei.h
index dea9230..e389408 100644 (file)
--- a/usr/src/sys/sys/namei.h
+++ b/usr/src/sys/sys/namei.h
@@ -1,10 +1,10 @@
-/*     namei.h 6.6     84/07/08        */
+/*     namei.h 6.7     84/08/28        */

 
 #ifndef _NAMEI_
 #define        _NAMEI_
 
 #ifdef KERNEL
 
 #ifndef _NAMEI_
 #define        _NAMEI_
 
 #ifdef KERNEL

-#include "../h/uio.h"
+#include "uio.h"

 #else
 #include <sys/uio.h>
 #endif
 #else
 #include <sys/uio.h>
 #endif

diff --git a/usr/src/sys/sys/param.h b/usr/src/sys/sys/param.h
index cbe794e..4e08fad 100644 (file)
--- a/usr/src/sys/sys/param.h
+++ b/usr/src/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*     param.h 6.3     84/07/31        */
+/*     param.h 6.4     84/08/28        */

 
 /*
  * Machine type dependent parameters.
 
 /*
  * Machine type dependent parameters.


@@ -46,7 +46,7 @@
  * Signals
  */
 #ifdef KERNEL
  * Signals
  */
 #ifdef KERNEL

-#include "../h/signal.h"
+#include "signal.h"

 #else
 #include <signal.h>
 #endif
 #else
 #include <signal.h>
 #endif


@@ -101,7 +101,7 @@
 #include       <sys/types.h>
 #else
 #ifndef LOCORE
 #include       <sys/types.h>
 #else
 #ifndef LOCORE

-#include       "../h/types.h"
+#include       "types.h"

 #endif
 #endif
 
 #endif
 #endif
 

diff --git a/usr/src/sys/sys/tty.h b/usr/src/sys/sys/tty.h
index 5445717..096440c 100644 (file)
--- a/usr/src/sys/sys/tty.h
+++ b/usr/src/sys/sys/tty.h
@@ -1,8 +1,8 @@
-/*     tty.h   6.1     83/07/29        */
+/*     tty.h   6.2     84/08/28        */

 
 #ifdef KERNEL
 
 #ifdef KERNEL

-#include "../h/ttychars.h"
-#include "../h/ttydev.h"
+#include "ttychars.h"
+#include "ttydev.h"

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

diff --git a/usr/src/sys/sys/user.h b/usr/src/sys/sys/user.h
index eae0e00..942ff7f 100644 (file)
--- a/usr/src/sys/sys/user.h
+++ b/usr/src/sys/sys/user.h
@@ -1,11 +1,11 @@
-/*     user.h  6.5     84/07/21        */
+/*     user.h  6.6     84/08/28        */

 
 #ifdef KERNEL
 #include "../machine/pcb.h"
 
 #ifdef KERNEL
 #include "../machine/pcb.h"

-#include "../h/dmap.h"
-#include "../h/time.h"
-#include "../h/resource.h"
-#include "../h/namei.h"
+#include "dmap.h"
+#include "time.h"
+#include "resource.h"
+#include "namei.h"

 #else
 #include <machine/pcb.h>
 #include <sys/dmap.h>
 #else
 #include <machine/pcb.h>
 #include <sys/dmap.h>


@@ -123,7 +123,11 @@ struct     user {
 #define        REALLYRETURN    3
 
 /* u_error codes */
 #define        REALLYRETURN    3
 
 /* u_error codes */

+#ifdef KERNEL
+#include "errno.h"
+#else

 #include <errno.h>
 #include <errno.h>

+#endif

 
 #ifdef KERNEL
 extern struct user u;
 
 #ifdef KERNEL
 extern struct user u;

diff --git a/usr/src/sys/sys/vcmd.h b/usr/src/sys/sys/vcmd.h
index 06a68e1..b841127 100644 (file)
--- a/usr/src/sys/sys/vcmd.h
+++ b/usr/src/sys/sys/vcmd.h
@@ -1,8 +1,12 @@
-/*     vcmd.h  6.1     83/07/29        */
+/*     vcmd.h  6.2     84/08/28        */

 
 #ifndef _IOCTL_
 
 #ifndef _IOCTL_

+#ifdef KERNEL
+#include "ioctl.h"
+#else

 #include <sys/ioctl.h>
 #endif
 #include <sys/ioctl.h>
 #endif

+#endif

 
 #define        VPRINT          0100
 #define        VPLOT           0200
 
 #define        VPRINT          0100
 #define        VPLOT           0200