merge in NFS code from Rick Macklem

[unix-history] / usr / src / sys / netinet / in_systm.h

diff --git a/usr/src/sys/netinet/in_systm.h b/usr/src/sys/netinet/in_systm.h
index 355cff4..98dadfe 100644 (file)
--- a/usr/src/sys/netinet/in_systm.h
+++ b/usr/src/sys/netinet/in_systm.h
@@ -1,11 +1,27 @@
-/*     in_systm.h      4.14    82/10/09        */
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)in_systm.h  7.3 (Berkeley) %G%
+ */

 
 /*
  * Miscellaneous internetwork
  * definitions for kernel.
  */
 
 
 /*
  * Miscellaneous internetwork
  * definitions for kernel.
  */
 

-#ifndef LOCORE

 /*
  * Network types.
  *
 /*
  * Network types.
  *


@@ -18,10 +34,7 @@ typedef u_short n_short;             /* short as received from the net */
 typedef u_long n_long;                 /* long as received from the net */
 
 typedef        u_long  n_time;                 /* ms since 00:00 GMT, byte rev */
 typedef u_long n_long;                 /* long as received from the net */
 
 typedef        u_long  n_time;                 /* ms since 00:00 GMT, byte rev */

-#endif

 
 

-#ifndef LOCORE

 #ifdef KERNEL
 n_time iptime();
 #endif
 #ifdef KERNEL
 n_time iptime();
 #endif

-#endif