From owner-svn-src-user@FreeBSD.ORG Wed Oct 21 13:10:03 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 761E21065676;
Wed, 21 Oct 2009 13:10:03 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 2874D8FC19;
Wed, 21 Oct 2009 13:10:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9LDA2GO000129;
Wed, 21 Oct 2009 13:10:02 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9LDA2hk000119;
Wed, 21 Oct 2009 13:10:02 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <200910211310.n9LDA2hk000119@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Wed, 21 Oct 2009 13:10:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r198323 - user/eri/pf45/head/sys/contrib/pf/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Oct 2009 13:10:03 -0000
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>