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 610b912..9db9714 100644 (file)
--- a/usr/src/sys/netns/ns.h
+++ b/usr/src/sys/netns/ns.h
@@ -2,14 +2,9 @@
  * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at 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'' without express or implied warranty.
+ * %sccs.include.redist.c%

  *
  *

- *      @(#)ns.h       7.3 (Berkeley) %G%
+ *     @(#)ns.h        7.7 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -90,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];
 };


@@ -117,4 +113,12 @@ union ns_host ns_broadhost;
 union ns_net ns_zeronet;
 union ns_net ns_broadnet;
 u_short ns_cksum();
 union ns_net ns_zeronet;
 union ns_net ns_broadnet;
 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