summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorMarco Pfatschbacher <mpf@cvs.openbsd.org>2008-10-22 23:04:46 +0000
committerMarco Pfatschbacher <mpf@cvs.openbsd.org>2008-10-22 23:04:46 +0000
commit722f3363bc6dbb56b427c4f04c9ea108c6ea9c7e (patch)
treec2b8e1752e345b7acb604ef98409c4480d7538c3 /sys/netinet
parent1508441abbe759040305900bc34ec75faf3b641a (diff)
#if INET => #ifdef INET
#if INET6 => #ifdef INET6
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_ipsp.c6
-rw-r--r--sys/netinet/ipsec_input.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index 039ed123966..7009e45b1a9 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipsp.c,v 1.173 2008/09/15 21:46:01 chl Exp $ */
+/* $OpenBSD: ip_ipsp.c,v 1.174 2008/10/22 23:04:45 mpf Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -965,12 +965,12 @@ char *
ipsp_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/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index 1e68064402c..3fbc250574e 100644
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec_input.c,v 1.90 2008/10/22 14:36:08 markus Exp $ */
+/* $OpenBSD: ipsec_input.c,v 1.91 2008/10/22 23:04:45 mpf Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -362,7 +362,7 @@ ipsec_common_input_cb(struct mbuf *m, struct tdb *tdbp, int skip, int protoff,
}
}
-#if INET6
+#ifdef INET6
/* IPv6-in-IP encapsulation. */
if (prot == IPPROTO_IPV6) {
if (m->m_pkthdr.len - skip < sizeof(struct ip6_hdr)) {