Remove unnecessary #ifdef MROUTING blocks. OK brad@ markus@

3 files changed, 3 insertions, 14 deletions

diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 505dc55771c..c2a73734bc7 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_gif.c,v 1.30 2003/12/10 07:22:43 itojun Exp $	*/
+/*	$OpenBSD: in_gif.c,v 1.31 2005/12/23 13:01:23 claudio Exp $	*/
 /*	$KAME: in_gif.c,v 1.50 2001/01/22 07:27:16 itojun Exp $	*/
 
 /*
@@ -50,10 +50,6 @@
 #include <netinet/ip6.h>
 #endif
 
-#ifdef MROUTING
-#include <netinet/ip_mroute.h>
-#endif /* MROUTING */
-
 #include "gif.h"
 #include "bridge.h"
 
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 41a27a99ce8..be9a9a8bb0c 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_proto.c,v 1.44 2005/07/14 02:09:46 uwe Exp $	*/
+/*	$OpenBSD: in_proto.c,v 1.45 2005/12/23 13:01:23 claudio Exp $	*/
 /*	$NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $	*/
 
 /*
@@ -148,10 +148,6 @@
 #include <netipx/ipx_ip.h>
 #endif /* IPXIP */
 
-#ifdef MROUTING
-#include <netinet/ip_mroute.h>
-#endif /* MROUTING */
-
 #ifdef INET6
 #include <netinet6/ip6_var.h>
 #endif /* INET6 */
diff --git a/sys/netinet/ip_gre.h b/sys/netinet/ip_gre.h
index 00bd3b14bdb..a290fbc964c 100644
--- a/sys/netinet/ip_gre.h
+++ b/sys/netinet/ip_gre.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip_gre.h,v 1.6 2002/06/09 16:26:10 itojun Exp $ */
+/*      $OpenBSD: ip_gre.h,v 1.7 2005/12/23 13:01:23 claudio Exp $ */
 /*	$NetBSD: ip_gre.h,v 1.3 1998/10/07 23:33:02 thorpej Exp $ */
 
 /*
@@ -77,8 +77,5 @@ void gre_mobile_input(struct mbuf *, ...);
 int     ipmobile_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 int     gre_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 
-#ifndef MROUTING
-void gre_ipip_input(struct mbuf *, ...);
-#endif /* MROUTING */
 #endif /* _KERNEL */
 #endif /* _NETINET_IP_GRE_H_ */