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.36
retrieving revision 1.38
diff -u -p -r1.36 -r1.38
--- src/sys/sys/socket.h	1998/06/26 13:57:20	1.36
+++ src/sys/sys/socket.h	1998/09/05 19:03:25	1.38
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.36 1998/06/26 13:57:20 hannken Exp $	*/
+/*	$NetBSD: socket.h,v 1.38 1998/09/05 19:03:25 kleink Exp $	*/
 
 /*
  * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
@@ -208,6 +208,8 @@ struct sockcred {
 #define	SOCKCREDSIZE(ngrps) \
 	(sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1)))
 
+
+#if !defined(_XOPEN_SOURCE)
 /*
  * Definitions for network related sysctl, CTL_NET.
  *
@@ -250,7 +252,9 @@ struct sockcred {
 	{ "arp", CTLTYPE_NODE }, \
 	{ "key", CTLTYPE_NODE }, \
 }
+#endif /* !_XOPEN_SOURCE */
 
+#if !defined(_XOPEN_SOURCE)
 /*
  * PF_ROUTE - Routing table
  *
@@ -270,6 +274,7 @@ struct sockcred {
 	{ "flags", CTLTYPE_STRUCT }, \
 	{ "iflist", CTLTYPE_STRUCT }, \
 }
+#endif /* !_XOPEN_SOURCE */
 
 /*
  * Maximum queue length specifiable by listen(2).
@@ -384,7 +389,7 @@ int	socket __P((int, int, int));
 int	socketpair __P((int, int, int, int *));
 __END_DECLS
 #else
-# if defined(_KERNEL) && !defined(_LKM)
+# if !defined(_LKM)
 #  include "opt_compat_freebsd.h"
 #  include "opt_compat_linux.h"
 #  include "opt_compat_sunos.h"