../h => (implicitly) ../sys

SCCS-vsn: sys/netiso/clnp_arp.c 7.3
SCCS-vsn: sys/netiso/clnp_debug.c 7.3
SCCS-vsn: sys/netiso/clnp_frag.c 7.4
SCCS-vsn: sys/netiso/clnp_input.c 7.5
SCCS-vsn: sys/netiso/clnp_options.c 7.4
SCCS-vsn: sys/netiso/clnp_raw.c 7.3
SCCS-vsn: sys/netiso/if_cons.c 7.3
SCCS-vsn: sys/netiso/tp_inet.c 7.3
SCCS-vsn: sys/netiso/tp_output.c 7.3
SCCS-vsn: sys/netiso/tp_param.h 7.3
SCCS-vsn: sys/netiso/tp_pcb.h 7.3
SCCS-vsn: sys/netiso/tp_user.h 7.3

diff --git a/usr/src/sys/netiso/clnp_arp.c b/usr/src/sys/netiso/clnp_arp.c
index e28b79a..19b5852 100644 (file)
--- a/usr/src/sys/netiso/clnp_arp.c
+++ b/usr/src/sys/netiso/clnp_arp.c
@@ -33,15 +33,15 @@ static char *rcsid = "$Header: clnp_arp.c,v 4.2 88/06/29 14:58:32 hagens Exp $";
 
 #ifdef ISO
 
 
 #ifdef ISO
 

-#include "../h/types.h"
-#include "../h/param.h"
-#include "../h/mbuf.h"
-#include "../h/domain.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/errno.h"
-#include "../h/ioctl.h"
+#include "types.h"
+#include "param.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "errno.h"
+#include "ioctl.h"

 
 #include "../net/if.h"
 #include "../net/route.h"
 
 #include "../net/if.h"
 #include "../net/route.h"

diff --git a/usr/src/sys/netiso/clnp_debug.c b/usr/src/sys/netiso/clnp_debug.c
index 96c73ee..77f6cde 100644 (file)
--- a/usr/src/sys/netiso/clnp_debug.c
+++ b/usr/src/sys/netiso/clnp_debug.c
@@ -31,14 +31,14 @@ SOFTWARE.
 static char *rcsid = "$Header: clnp_debug.c,v 4.2 88/06/29 14:58:34 hagens Exp $";
 #endif lint
 
 static char *rcsid = "$Header: clnp_debug.c,v 4.2 88/06/29 14:58:34 hagens Exp $";
 #endif lint
 

-#include "../h/types.h"
-#include "../h/param.h"
-#include "../h/mbuf.h"
-#include "../h/domain.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/errno.h"
+#include "types.h"
+#include "param.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "errno.h"

 
 #include "../net/if.h"
 #include "../net/route.h"
 
 #include "../net/if.h"
 #include "../net/route.h"

diff --git a/usr/src/sys/netiso/clnp_frag.c b/usr/src/sys/netiso/clnp_frag.c
index 6f71f4a..cada3f6 100644 (file)
--- a/usr/src/sys/netiso/clnp_frag.c
+++ b/usr/src/sys/netiso/clnp_frag.c
@@ -33,14 +33,14 @@ static char *rcsid = "$Header: /var/src/sys/netiso/RCS/clnp_frag.c,v 5.1 89/02/0
 
 #ifdef ISO
 
 
 #ifdef ISO
 

-#include "../h/types.h"
-#include "../h/param.h"
-#include "../h/mbuf.h"
-#include "../h/domain.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/errno.h"
+#include "types.h"
+#include "param.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "errno.h"

 
 #include "../net/if.h"
 #include "../net/route.h"
 
 #include "../net/if.h"
 #include "../net/route.h"


@@ -742,7 +742,7 @@ struct clnp_fragl   *cfh;           /* fragment header */
 }
 #ifdef TROLL
 static int troll_cnt;
 }
 #ifdef TROLL
 static int troll_cnt;

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

 /*
  * FUNCTION:           troll_random
  *
 /*
  * FUNCTION:           troll_random
  *

diff --git a/usr/src/sys/netiso/clnp_input.c b/usr/src/sys/netiso/clnp_input.c
index 342abd2..1dff8db 100644 (file)
--- a/usr/src/sys/netiso/clnp_input.c
+++ b/usr/src/sys/netiso/clnp_input.c
@@ -26,21 +26,21 @@ SOFTWARE.
  */
 /* $Header: /var/src/sys/netiso/RCS/clnp_input.c,v 5.1 89/02/09 16:20:32 hagens Exp $ */
 /* $Source: /var/src/sys/netiso/RCS/clnp_input.c,v $ */
  */
 /* $Header: /var/src/sys/netiso/RCS/clnp_input.c,v 5.1 89/02/09 16:20:32 hagens Exp $ */
 /* $Source: /var/src/sys/netiso/RCS/clnp_input.c,v $ */

-/*     @(#)clnp_input.c        7.4 (Berkeley) %G% */
+/*     @(#)clnp_input.c        7.5 (Berkeley) %G% */

 
 #ifndef lint
 static char *rcsid = "$Header: /var/src/sys/netiso/RCS/clnp_input.c,v 5.1 89/02/09 16:20:32 hagens Exp $";
 #endif lint
 
 
 #ifndef lint
 static char *rcsid = "$Header: /var/src/sys/netiso/RCS/clnp_input.c,v 5.1 89/02/09 16:20:32 hagens Exp $";
 #endif lint
 

-#include "../h/types.h"
-#include "../h/param.h"
-#include "../h/mbuf.h"
-#include "../h/domain.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/errno.h"
-#include "../h/time.h"
+#include "types.h"
+#include "param.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "errno.h"
+#include "time.h"

 
 #include "../net/if.h"
 #include "../net/iftypes.h"
 
 #include "../net/if.h"
 #include "../net/iftypes.h"

diff --git a/usr/src/sys/netiso/clnp_options.c b/usr/src/sys/netiso/clnp_options.c
index 91fadb5..7f65949 100644 (file)
--- a/usr/src/sys/netiso/clnp_options.c
+++ b/usr/src/sys/netiso/clnp_options.c
@@ -33,14 +33,14 @@ static char *rcsid = "$Header: /var/src/sys/netiso/RCS/clnp_options.c,v 5.1 89/0
 
 #ifdef ISO
 
 
 #ifdef ISO
 

-#include "../h/types.h"
-#include "../h/param.h"
-#include "../h/mbuf.h"
-#include "../h/domain.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/errno.h"
+#include "types.h"
+#include "param.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "errno.h"

 
 #include "../net/if.h"
 #include "../net/route.h"
 
 #include "../net/if.h"
 #include "../net/route.h"

diff --git a/usr/src/sys/netiso/clnp_raw.c b/usr/src/sys/netiso/clnp_raw.c
index 465a61f..65bc31d 100644 (file)
--- a/usr/src/sys/netiso/clnp_raw.c
+++ b/usr/src/sys/netiso/clnp_raw.c
@@ -31,15 +31,15 @@ static char *rcsid = "$Header: clnp_raw.c,v 4.2 88/06/29 14:58:56 hagens Exp $";
 
 #ifdef ISO
 
 
 #ifdef ISO
 

-#include "../h/types.h"
-#include "../h/param.h"
-#include "../h/mbuf.h"
-#include "../h/domain.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/errno.h"
-#include "../h/time.h"
+#include "types.h"
+#include "param.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "errno.h"
+#include "time.h"

 
 #include "../net/if.h"
 #include "../net/route.h"
 
 #include "../net/if.h"
 #include "../net/route.h"

diff --git a/usr/src/sys/netiso/if_cons.c b/usr/src/sys/netiso/if_cons.c
index 26c25c8..b50bcf9 100644 (file)
--- a/usr/src/sys/netiso/if_cons.c
+++ b/usr/src/sys/netiso/if_cons.c
@@ -2353,7 +2353,7 @@ cons_ctloutput(cmd, so, level, optname, mp)
  *  for consistency - cons subnet service calls its higher layer
  *  through the protosw entry.
  * FUNCTION & ARGUMENTS:
  *  for consistency - cons subnet service calls its higher layer
  *  through the protosw entry.
  * FUNCTION & ARGUMENTS:

- *  cmd is a PRC_* command, list found in ../h/protosw.h
+ *  cmd is a PRC_* command, list found in ../sys/protosw.h

  *  copcb is the obvious.
  *  This serves the higher-layer cons service.
  * NOTE: this takes 3rd arg. because cons uses it to inform itself
  *  copcb is the obvious.
  *  This serves the higher-layer cons service.
  * NOTE: this takes 3rd arg. because cons uses it to inform itself

diff --git a/usr/src/sys/netiso/tp_inet.c b/usr/src/sys/netiso/tp_inet.c
index bb50abd..07d5f20 100644 (file)
--- a/usr/src/sys/netiso/tp_inet.c
+++ b/usr/src/sys/netiso/tp_inet.c
@@ -552,7 +552,7 @@ discard:
 }
 
 
 }
 
 

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

 #include "../netinet/ip_icmp.h"
 
 extern void tp_quench();
 #include "../netinet/ip_icmp.h"
 
 extern void tp_quench();

diff --git a/usr/src/sys/netiso/tp_output.c b/usr/src/sys/netiso/tp_output.c
index e500545..ffbbb11 100644 (file)
--- a/usr/src/sys/netiso/tp_output.c
+++ b/usr/src/sys/netiso/tp_output.c
@@ -298,9 +298,9 @@ done:
  *
  * FUNCTION and ARGUMENTS:
  *     Implements the socket options at transport level.
  *
  * FUNCTION and ARGUMENTS:
  *     Implements the socket options at transport level.

- *     (cmd) is either PRCO_SETOPT or PRCO_GETOPT (see ../h/protosw.h).
+ *     (cmd) is either PRCO_SETOPT or PRCO_GETOPT (see ../sys/protosw.h).

  *     (so) is the socket.
  *     (so) is the socket.

- *     (level) is SOL_TRANSPORT (see ../h/socket.h)
+ *     (level) is SOL_TRANSPORT (see ../sys/socket.h)

  *     (optname) is the particular command or option to be set.
  *     (**mp) is an mbuf structure.  
  *
  *     (optname) is the particular command or option to be set.
  *     (**mp) is an mbuf structure.  
  *

diff --git a/usr/src/sys/netiso/tp_param.h b/usr/src/sys/netiso/tp_param.h
index 41d425b..3524d0b 100644 (file)
--- a/usr/src/sys/netiso/tp_param.h
+++ b/usr/src/sys/netiso/tp_param.h
@@ -194,7 +194,7 @@ SOFTWARE.
 #ifndef        MNULL
 #define        MNULL                           (struct mbuf *)0
 #endif         MNULL
 #ifndef        MNULL
 #define        MNULL                           (struct mbuf *)0
 #endif         MNULL

-       /* if ../h/mbuf.h gets MT_types up to 0x40, these will 
+       /* if ../sys/mbuf.h gets MT_types up to 0x40, these will 

         * have to be changed:
         */
 #define        MT_XPD                          0x44    
         * have to be changed:
         */
 #define        MT_XPD                          0x44    

diff --git a/usr/src/sys/netiso/tp_pcb.h b/usr/src/sys/netiso/tp_pcb.h
index 9a794e1..7306a71 100644 (file)
--- a/usr/src/sys/netiso/tp_pcb.h
+++ b/usr/src/sys/netiso/tp_pcb.h
@@ -42,7 +42,7 @@ SOFTWARE.
 #include "../netiso/tp_timer.h"
 #include "../netiso/tp_user.h"
 #ifndef sblock
 #include "../netiso/tp_timer.h"
 #include "../netiso/tp_user.h"
 #ifndef sblock

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

 #endif sblock
 
 /* NOTE: the code depends on REF_CLOSED > REF_OPEN > the rest, and
 #endif sblock
 
 /* NOTE: the code depends on REF_CLOSED > REF_OPEN > the rest, and

diff --git a/usr/src/sys/netiso/tp_user.h b/usr/src/sys/netiso/tp_user.h
index 2d3ce7c..d7f2066 100644 (file)
--- a/usr/src/sys/netiso/tp_user.h
+++ b/usr/src/sys/netiso/tp_user.h
@@ -29,13 +29,13 @@ SOFTWARE.
  *
  * $Header: tp_user.h,v 5.2 88/11/04 15:44:44 nhall Exp $
  * $Source: /usr/argo/sys/netiso/RCS/tp_user.h,v $
  *
  * $Header: tp_user.h,v 5.2 88/11/04 15:44:44 nhall Exp $
  * $Source: /usr/argo/sys/netiso/RCS/tp_user.h,v $

- *     @(#)tp_user.h   7.2 (Berkeley) %G%
+ *     @(#)tp_user.h   7.3 (Berkeley) %G%

  *
  * These are the values a real-live user ;-) needs. 
  */
 
 #ifdef KERNEL
  *
  * These are the values a real-live user ;-) needs. 
  */
 
 #ifdef KERNEL

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

 #else KERNEL
 #include  <sys/types.h>
 #endif KERNEL
 #else KERNEL
 #include  <sys/types.h>
 #endif KERNEL