From 27c5b84df641e1a68b22894daa392612fa24e814 Mon Sep 17 00:00:00 2001
From: sumikawa <sumikawa>
Date: Sun, 16 Jan 2000 18:51:28 +0000
Subject: [PATCH] make buildable on IPv4-only config.

---
 freebsd3/sys/netinet/in_pcb.c     | 2 --
 freebsd3/sys/netinet/ip_input.c   | 3 +--
 freebsd3/sys/netinet/ip_mroute.c  | 2 --
 freebsd3/sys/netinet/ip_output.c  | 2 --
 freebsd3/sys/netinet/raw_ip.c     | 2 --
 freebsd3/sys/netinet/udp_usrreq.c | 2 --
 6 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/freebsd3/sys/netinet/in_pcb.c b/freebsd3/sys/netinet/in_pcb.c
index e89c52e07c..9c4ed1ba0f 100644
--- a/freebsd3/sys/netinet/in_pcb.c
+++ b/freebsd3/sys/netinet/in_pcb.c
@@ -59,10 +59,8 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#ifdef INET6
 #include <netinet6/ip6.h>
 #include <netinet6/ip6_var.h>
-#endif /* INET6 */
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
diff --git a/freebsd3/sys/netinet/ip_input.c b/freebsd3/sys/netinet/ip_input.c
index a382cc2e0f..adeafc1f91 100644
--- a/freebsd3/sys/netinet/ip_input.c
+++ b/freebsd3/sys/netinet/ip_input.c
@@ -100,9 +100,8 @@
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
-#ifdef INET6
+#include <netinet6/ip6.h>
 #include <netinet6/ip6_var.h>
-#endif /* INET6 */
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
diff --git a/freebsd3/sys/netinet/ip_mroute.c b/freebsd3/sys/netinet/ip_mroute.c
index f17f95384f..b96654a0c6 100644
--- a/freebsd3/sys/netinet/ip_mroute.c
+++ b/freebsd3/sys/netinet/ip_mroute.c
@@ -30,10 +30,8 @@
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
-#ifdef INET6
 #include <netinet6/ip6.h>
 #include <netinet6/ip6_var.h>
-#endif /* INET6 */
 #include <netinet/in_pcb.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
diff --git a/freebsd3/sys/netinet/ip_output.c b/freebsd3/sys/netinet/ip_output.c
index beb2d9eb9d..2b7fa275cc 100644
--- a/freebsd3/sys/netinet/ip_output.c
+++ b/freebsd3/sys/netinet/ip_output.c
@@ -59,10 +59,8 @@
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#ifdef INET6
 #include <netinet6/ip6.h>
 #include <netinet6/ip6_var.h>
-#endif /* INET6 */
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
diff --git a/freebsd3/sys/netinet/raw_ip.c b/freebsd3/sys/netinet/raw_ip.c
index 9bd377d416..d330c7e2b2 100644
--- a/freebsd3/sys/netinet/raw_ip.c
+++ b/freebsd3/sys/netinet/raw_ip.c
@@ -56,10 +56,8 @@
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#ifdef INET6
 #include <netinet6/ip6.h>
 #include <netinet6/ip6_var.h>
-#endif /* INET6 */
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
diff --git a/freebsd3/sys/netinet/udp_usrreq.c b/freebsd3/sys/netinet/udp_usrreq.c
index c1992a09d5..93996786d3 100644
--- a/freebsd3/sys/netinet/udp_usrreq.c
+++ b/freebsd3/sys/netinet/udp_usrreq.c
@@ -89,10 +89,8 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
-#if defined(INET6) && defined(MAPPED_ADDR_ENABLED)
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#endif
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_icmp.h>