From 604d89458ab94ec81eaefa2d55ef219cba461e31 Mon Sep 17 00:00:00 2001 From: bz Date: Tue, 2 Dec 2008 21:37:28 +0000 Subject: Rather than using hidden includes (with cicular dependencies), directly include only the header files needed. This reduces the unneeded spamming of various headers into lots of files. For now, this leaves us with very few modules including vnet.h and thus needing to depend on opt_route.h. Reviewed by: brooks, gnn, des, zec, imp Sponsored by: The FreeBSD Foundation --- sys/contrib/ipfilter/netinet/ip_fil_freebsd.c | 3 +++ sys/contrib/ipfilter/netinet/mlfk_ipl.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'sys/contrib/ipfilter/netinet') diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c index f0604b0..3bef15c 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c @@ -112,6 +112,9 @@ static const char rcsid[] = "@(#)$Id: ip_fil_freebsd.c,v 2.53.2.50 2007/09/20 12 #include "netinet/ip_scan.h" #endif #include "netinet/ip_pool.h" +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800056) +# include +#endif #if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) # include #endif diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c index 0b462d9..36048e4 100644 --- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c +++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c @@ -43,9 +43,7 @@ static int sysctl_ipf_int ( SYSCTL_HANDLER_ARGS ); static int ipf_modload(void); static int ipf_modunload(void); -#if __FreeBSD_version < 800055 SYSCTL_DECL(_net_inet); -#endif #define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \ ptr, val, sysctl_ipf_int, "I", descr); -- cgit v1.1