Date: Wed, 21 Oct 2009 13:10:02 +0000 (UTC) From: Ermal Luçi <eri@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r198323 - user/eri/pf45/head/sys/contrib/pf/net Message-ID: <200910211310.n9LDA2hk000119@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eri Date: Wed Oct 21 13:10:02 2009 New Revision: 198323 URL: http://svn.freebsd.org/changeset/base/198323 Log: Remove direct include of opt_global.h since it is not meant to be included directly. Modified: user/eri/pf45/head/sys/contrib/pf/net/pf.c user/eri/pf45/head/sys/contrib/pf/net/pf_if.c user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c user/eri/pf45/head/sys/contrib/pf/net/pf_lb.c user/eri/pf45/head/sys/contrib/pf/net/pf_norm.c user/eri/pf45/head/sys/contrib/pf/net/pf_osfp.c user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c user/eri/pf45/head/sys/contrib/pf/net/pf_table.c Modified: user/eri/pf45/head/sys/contrib/pf/net/pf.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf.c Wed Oct 21 13:00:01 2009 (r198322) +++ user/eri/pf45/head/sys/contrib/pf/net/pf.c Wed Oct 21 13:10:02 2009 (r198323) @@ -36,7 +36,6 @@ */ #ifdef __FreeBSD__ -#include "opt_global.h" #include "opt_inet.h" #include "opt_inet6.h" Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_if.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf_if.c Wed Oct 21 13:00:01 2009 (r198322) +++ user/eri/pf45/head/sys/contrib/pf/net/pf_if.c Wed Oct 21 13:10:02 2009 (r198323) @@ -33,7 +33,6 @@ */ #if defined(__FreeBSD__) -#include "opt_global.h" #include "opt_inet.h" #include "opt_inet6.h" Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c Wed Oct 21 13:00:01 2009 (r198322) +++ user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c Wed Oct 21 13:10:02 2009 (r198323) @@ -39,7 +39,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_global.h" #include "opt_inet.h" #include "opt_inet6.h" #include "opt_bpf.h" Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_lb.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf_lb.c Wed Oct 21 13:00:01 2009 (r198322) +++ user/eri/pf45/head/sys/contrib/pf/net/pf_lb.c Wed Oct 21 13:10:02 2009 (r198323) @@ -35,10 +35,9 @@ * */ - #ifdef __FreeBSD__ -#include "opt_global.h" - #include "opt_inet.h" - #include "opt_inet6.h" +#ifdef __FreeBSD__ +#include "opt_inet.h" +#include "opt_inet6.h" #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_norm.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf_norm.c Wed Oct 21 13:00:01 2009 (r198322) +++ user/eri/pf45/head/sys/contrib/pf/net/pf_norm.c Wed Oct 21 13:10:02 2009 (r198323) @@ -26,7 +26,6 @@ */ #ifdef __FreeBSD__ -#include "opt_global.h" #include "opt_inet.h" #include "opt_inet6.h" #include "opt_pf.h" Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_osfp.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf_osfp.c Wed Oct 21 13:00:01 2009 (r198322) +++ user/eri/pf45/head/sys/contrib/pf/net/pf_osfp.c Wed Oct 21 13:10:02 2009 (r198323) @@ -17,10 +17,6 @@ * */ -#ifdef __FreeBSD__ -#include "opt_global.h" -#endif - #include <sys/param.h> #include <sys/socket.h> #ifdef _KERNEL Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c Wed Oct 21 13:00:01 2009 (r198322) +++ user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c Wed Oct 21 13:10:02 2009 (r198323) @@ -35,15 +35,11 @@ * */ - #ifdef __FreeBSD__ - #include <sys/cdefs.h> +#ifdef __FreeBSD__ +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); - #endif - -#ifdef _KERNEL -#include "opt_global.h" #endif - + #include <sys/param.h> #include <sys/socket.h> #ifdef _KERNEL Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_table.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf_table.c Wed Oct 21 13:00:01 2009 (r198322) +++ user/eri/pf45/head/sys/contrib/pf/net/pf_table.c Wed Oct 21 13:10:02 2009 (r198323) @@ -30,25 +30,24 @@ * */ - #ifdef __FreeBSD__ -#include "opt_global.h" - #include "opt_inet.h" - #include "opt_inet6.h" +#ifdef __FreeBSD__ +#include "opt_inet.h" +#include "opt_inet6.h" - #include <sys/cdefs.h> +#include <sys/cdefs.h> __FBSDID("$FreeBSD$"); - #endif +#endif #include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> #include <sys/mbuf.h> #include <sys/kernel.h> - #ifdef __FreeBSD__ - #include <sys/malloc.h> +#ifdef __FreeBSD__ +#include <sys/malloc.h> #else #include <sys/pool.h> - #endif +#endif #include <net/if.h> #include <net/route.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910211310.n9LDA2hk000119>