summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2006-06-04 19:32:32 +0000
committerpjd <pjd@FreeBSD.org>2006-06-04 19:32:32 +0000
commit501751fbc7b2af470f10aeec5b6c1bfaa56d9ea2 (patch)
tree167cb1bb8a2d3fe837c16d1cda45260fe151053c
parent4f755f5871cc77a711b179f14f52643de1d5b955 (diff)
downloadFreeBSD-src-501751fbc7b2af470f10aeec5b6c1bfaa56d9ea2.zip
FreeBSD-src-501751fbc7b2af470f10aeec5b6c1bfaa56d9ea2.tar.gz
Change '#if INET' and '#if INET6' to '#ifdef INET' and '#ifdef INET6'.
This unbreaks compiling a kernel with FAST_IPSEC and no INET6.
-rw-r--r--sys/netipsec/ipsec.c4
-rw-r--r--sys/netipsec/ipsec_input.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index 4d1376f..1a0763b 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -1842,12 +1842,12 @@ char *
ipsec_address(union sockaddr_union* sa)
{
switch (sa->sa.sa_family) {
-#if INET
+#ifdef INET
case AF_INET:
return inet_ntoa4(sa->sin.sin_addr);
#endif /* INET */
-#if INET6
+#ifdef INET6
case AF_INET6:
return ip6_sprintf(&sa->sin6.sin6_addr);
#endif /* INET6 */
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c
index 01f6974..753b78a 100644
--- a/sys/netipsec/ipsec_input.c
+++ b/sys/netipsec/ipsec_input.c
@@ -365,7 +365,7 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
goto bad;
}
}
-#if INET6
+#ifdef INET6
/* IPv6-in-IP encapsulation. */
if (prot == IPPROTO_IPV6) {
struct ip6_hdr ip6n;
OpenPOWER on IntegriCloud