summaryrefslogtreecommitdiff
path: root/sys/netinet6/ipv6_input.c
diff options
context:
space:
mode:
authorcmetz <cmetz@cvs.openbsd.org>1999-03-09 05:31:56 +0000
committercmetz <cmetz@cvs.openbsd.org>1999-03-09 05:31:56 +0000
commitc17820c2d223c38e9b24af57e8e93304133580c5 (patch)
tree078025a176d45d7638cee69e3ba767edd26c7223 /sys/netinet6/ipv6_input.c
parente25d73e4b2f1e9be6806cea63cd0836e3097457f (diff)
Demangled the INET6 stuff so as not to require any extra options and not to
be mutually exclusive with the IPSEC option.
Diffstat (limited to 'sys/netinet6/ipv6_input.c')
-rw-r--r--sys/netinet6/ipv6_input.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/netinet6/ipv6_input.c b/sys/netinet6/ipv6_input.c
index 1e3866903cf..a0e01faf481 100644
--- a/sys/netinet6/ipv6_input.c
+++ b/sys/netinet6/ipv6_input.c
@@ -40,9 +40,12 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
#include <netinet/ip.h>
#include <netinet/in_pcb.h>
-#if __OpenBSD__ && defined(NRL_IPSEC)
+#if __OpenBSD__
+#undef IPSEC
+#ifdef NRL_IPSEC
#define IPSEC 1
-#endif /* __OpenBSD__ && defined(NRL_IPSEC) */
+#endif /* NRL_IPSEC */
+#endif /* __OpenBSD__ */
#ifdef IPSEC
#include <sys/osdep.h>
@@ -56,12 +59,15 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
#include <sys/sysctl.h>
#endif /* __FreeBSD__ */
-#ifdef DEBUG_NRL_SYS
+#ifdef DEBUG_NRL
#include <sys/debug.h>
-#endif /* DEBUG_NRL_SYS */
-#ifdef DEBUG_NRL_NETINET6
+#else /* DEBUG_NRL */
+#if __OpenBSD__
#include <netinet6/debug.h>
-#endif /* DEBUG_NRL_NETINET6 */
+#else /* __OpenBSD__ */
+#include <sys/debug.h>
+#endif /* __OpenBSD__ */
+#endif /* DEBUG_NRL */
/*
* Globals