Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.43.4.1
retrieving revision 1.46.8.1
diff -u -p -r1.43.4.1 -r1.46.8.1
--- src/sys/sys/socket.h	1999/07/01 23:50:36	1.43.4.1
+++ src/sys/sys/socket.h	1999/12/27 18:36:35	1.46.8.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.43.4.1 1999/07/01 23:50:36 thorpej Exp $	*/
+/*	$NetBSD: socket.h,v 1.46.8.1 1999/12/27 18:36:35 wrstuden Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -205,14 +205,16 @@ struct sockproto {
 #define _SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(u_char) * 2 - \
 				_SS_PAD1SIZE - _SS_ALIGNSIZE)
 
+#if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500
 struct sockaddr_storage {
-	u_char	__ss_len;	/* address length */
-	u_char	__ss_family;	/* address family */
+	u_char	ss_len;		/* address length */
+	u_char	ss_family;	/* address family */
 	char	__ss_pad1[_SS_PAD1SIZE];
 	int64_t	__ss_align;	/* force desired structure storage alignment */
 	char	__ss_pad2[_SS_PAD2SIZE];
 };
-#endif
+#endif /* !_XOPEN_SOURCE || ... */
+#endif /* 1 */
 
 /*
  * Protocol families, same as address families for now.
@@ -337,13 +339,15 @@ struct sockcred {
  */
 #define NET_RT_DUMP	1		/* dump; may limit to a.f. */
 #define NET_RT_FLAGS	2		/* by flags, e.g. RESOLVING */
-#define NET_RT_IFLIST	3		/* survey interface list */
-#define	NET_RT_MAXID	4
+#define NET_RT_OIFLIST	3		/* old NET_RT_IFLIST (pre 1.5) */
+#define NET_RT_IFLIST	4		/* survey interface list */
+#define	NET_RT_MAXID	5
 
 #define CTL_NET_RT_NAMES { \
 	{ 0, 0 }, \
 	{ "dump", CTLTYPE_STRUCT }, \
 	{ "flags", CTLTYPE_STRUCT }, \
+	{ 0, 0 }, \
 	{ "iflist", CTLTYPE_STRUCT }, \
 }
 #endif /* !_XOPEN_SOURCE */
@@ -480,11 +484,7 @@ __END_DECLS
 #define MSG_COMPAT	0x8000
 #endif
 
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
 void	pfctlinput __P((int, struct sockaddr *));
-__END_DECLS
 #endif /* !_KERNEL */
 
 #endif /* !_SYS_SOCKET_H_ */