#if INET => #ifdef INET

#if INET6 => #ifdef INET6

9 files changed, 19 insertions, 19 deletions

diff --git a/sys/arch/vax/if/if_le.c b/sys/arch/vax/if/if_le.c
index 2073224e40d..bedd2e4010d 100644
--- a/sys/arch/vax/if/if_le.c
+++ b/sys/arch/vax/if/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.15 2008/06/26 05:42:13 ray Exp $	*/
+/*	$OpenBSD: if_le.c,v 1.16 2008/10/22 23:04:45 mpf Exp $	*/
 /*	$NetBSD: if_le.c,v 1.14 1999/08/14 18:40:23 ragge Exp $	*/
 
 /*-
@@ -78,7 +78,7 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-#if INET
+#ifdef INET
 #include <netinet/in.h>
 #endif
 #include <netinet/if_ether.h>
diff --git a/sys/arch/vax/mbus/if_le_fwio.c b/sys/arch/vax/mbus/if_le_fwio.c
index 8a0011535f5..67adf19d662 100644
--- a/sys/arch/vax/mbus/if_le_fwio.c
+++ b/sys/arch/vax/mbus/if_le_fwio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_fwio.c,v 1.1 2008/08/18 23:19:25 miod Exp $	*/
+/*	$OpenBSD: if_le_fwio.c,v 1.2 2008/10/22 23:04:45 mpf Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -93,7 +93,7 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-#if INET
+#ifdef INET
 #include <netinet/in.h>
 #endif
 #include <netinet/if_ether.h>
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index c8175bf1511..c535f9cac30 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.51 2008/09/17 20:10:37 chl Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.52 2008/10/22 23:04:45 mpf Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -125,7 +125,7 @@
 #include <net/route.h>
 #include <net/bpf.h>
 
-#if INET
+#ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index ef024f8d4f3..35966944a24 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sl.c,v 1.35 2007/12/20 02:53:02 brad Exp $	*/
+/*	$OpenBSD: if_sl.c,v 1.36 2008/10/22 23:04:45 mpf Exp $	*/
 /*	$NetBSD: if_sl.c,v 1.39.4.1 1996/06/02 16:26:31 thorpej Exp $	*/
 
 /*
@@ -83,7 +83,7 @@
 #include <net/netisr.h>
 #include <net/route.h>
 
-#if INET
+#ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
diff --git a/sys/net/if_strip.c b/sys/net/if_strip.c
index 791781ed5b4..f6febb012b3 100644
--- a/sys/net/if_strip.c
+++ b/sys/net/if_strip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_strip.c,v 1.34 2008/09/10 14:01:23 blambert Exp $	*/
+/*	$OpenBSD: if_strip.c,v 1.35 2008/10/22 23:04:45 mpf Exp $	*/
 /*	$NetBSD: if_strip.c,v 1.2.4.3 1996/08/03 00:58:32 jtc Exp $	*/
 /*	from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $	*/
 
@@ -115,7 +115,7 @@
 #include <net/netisr.h>
 #include <net/route.h>
 
-#if INET
+#ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c
index c39d86fc9e6..67dc4fe6f34 100644
--- a/sys/net/pfkeyv2_convert.c
+++ b/sys/net/pfkeyv2_convert.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfkeyv2_convert.c,v 1.30 2007/09/13 21:00:14 hshoexer Exp $	*/
+/*	$OpenBSD: pfkeyv2_convert.c,v 1.31 2008/10/22 23:04:45 mpf Exp $	*/
 /*
  * The author of this code is Angelos D. Keromytis (angelos@keromytis.org)
  *
@@ -680,7 +680,7 @@ import_address(struct sockaddr *sa, struct sadb_address *sadb_address)
 			break;
 #endif /* INET */
 
-#if INET6
+#ifdef INET6
 		case AF_INET6:
 			salen = sizeof(struct sockaddr_in6);
 			break;
diff --git a/sys/net/pfkeyv2_parsemessage.c b/sys/net/pfkeyv2_parsemessage.c
index ba3b743a286..ba37529a67d 100644
--- a/sys/net/pfkeyv2_parsemessage.c
+++ b/sys/net/pfkeyv2_parsemessage.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfkeyv2_parsemessage.c,v 1.42 2007/07/30 11:43:59 hshoexer Exp $	*/
+/*	$OpenBSD: pfkeyv2_parsemessage.c,v 1.43 2008/10/22 23:04:45 mpf Exp $	*/
 
 /*
  *	@(#)COPYRIGHT	1.1 (NRL) 17 January 1995
@@ -557,7 +557,7 @@ pfkeyv2_parsemessage(void *p, int len, void **headers)
 					}
 				}
 				break;
-#if INET6
+#ifdef INET6
 			case AF_INET6:
 				if (i != sizeof(struct sadb_address) +
 				    PADUP(sizeof(struct sockaddr_in6))) {
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)) {