BSD 4_3_Tahoe release

[unix-history] / usr / src / sys / netns / ns.h

diff --git a/usr/src/sys/netns/ns.h b/usr/src/sys/netns/ns.h
index 63b8a86..7c788e3 100644 (file)
--- a/usr/src/sys/netns/ns.h
+++ b/usr/src/sys/netns/ns.h
@@ -1,9 +1,20 @@
 /*
 /*

- * Copyright (c) 1984, 1985, 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)ns.h        7.1 (Berkeley) 6/5/86
+ * 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.
+ *
+ *     @(#)ns.h        7.4 (Berkeley) 6/29/88

  */
 
 /*
  */
 
 /*


@@ -103,21 +114,6 @@ struct sockaddr_ns {
 #define ns_nullhost(x) (((x).x_host.s_host[0]==0) && \
        ((x).x_host.s_host[1]==0) && ((x).x_host.s_host[2]==0))
 
 #define ns_nullhost(x) (((x).x_host.s_host[0]==0) && \
        ((x).x_host.s_host[1]==0) && ((x).x_host.s_host[2]==0))
 

-#if !defined(vax) && !defined(ntohl) && !defined(lint)
-/*
- * Macros for number representation conversion.
- */
-#define        ntohl(x)        (x)
-#define        ntohs(x)        (x)
-#define        htonl(x)        (x)
-#define        htons(x)        (x)
-#endif
-
-#if !defined(ntohl) && (defined(vax) || defined(lint))
-u_short        ntohs(), htons();
-u_long ntohl(), htonl();
-#endif
-

 #ifdef KERNEL
 extern struct domain nsdomain;
 union ns_host ns_thishost;
 #ifdef KERNEL
 extern struct domain nsdomain;
 union ns_host ns_thishost;