compaq changes

[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 4e64794..9db9714 100644 (file)
--- a/usr/src/sys/netns/ns.h
+++ b/usr/src/sys/netns/ns.h
@@ -1,9 +1,10 @@
 /*
 /*

- * 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        6.11 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ *     @(#)ns.h        7.7 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -84,7 +85,8 @@ struct ns_addr {
  * Socket address, Xerox style
  */
 struct sockaddr_ns {
  * Socket address, Xerox style
  */
 struct sockaddr_ns {

-       u_short         sns_family;
+       u_char          sns_len;
+       u_char          sns_family;

        struct ns_addr  sns_addr;
        char            sns_zero[2];
 };
        struct ns_addr  sns_addr;
        char            sns_zero[2];
 };


@@ -103,24 +105,20 @@ 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)
-#if !defined(INET)
-/*
- * Macros for number representation conversion.
- */
-#define        ntohl(x)        (x)
-#define        ntohs(x)        (x)
-#define        htonl(x)        (x)
-#define        htons(x)        (x)
-#endif
-#endif
-

 #ifdef KERNEL
 extern struct domain nsdomain;
 #ifdef KERNEL
 extern struct domain nsdomain;

-extern union ns_host ns_thishost;
-extern union ns_host ns_zerohost;
-extern union ns_host ns_broadhost;
-extern union ns_net ns_zeronet;
-extern union ns_net ns_broadnet;
+union ns_host ns_thishost;
+union ns_host ns_zerohost;
+union ns_host ns_broadhost;
+union ns_net ns_zeronet;
+union ns_net ns_broadnet;

 u_short ns_cksum();
 u_short ns_cksum();

+#else
+#ifdef __STDC__
+extern struct ns_addr ns_addr(const char *);
+extern char *ns_ntoa(struct ns_addr);
+#else
+extern struct ns_addr ns_addr();
+extern char *ns_ntoa();
+#endif

 #endif
 #endif