From owner-svn-src-user@FreeBSD.ORG  Mon Oct 12 22:40:43 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 BCD03106568D;
	Mon, 12 Oct 2009 22:40:43 +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 9313F8FC19;
	Mon, 12 Oct 2009 22:40:43 +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 n9CMeh0R087657;
	Mon, 12 Oct 2009 22:40:43 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9CMehnL087654;
	Mon, 12 Oct 2009 22:40:43 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <200910122240.n9CMehnL087654@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Mon, 12 Oct 2009 22:40:43 +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: r198008 - 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 &quot; user&quot;
	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: Mon, 12 Oct 2009 22:40:43 -0000

Author: eri
Date: Mon Oct 12 22:40:43 2009
New Revision: 198008
URL: http://svn.freebsd.org/changeset/base/198008

Log:
  Unbreak building of userland utilities.

Modified:
  user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c
  user/eri/pf45/head/sys/contrib/pf/net/pfvar.h

Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c	Mon Oct 12 22:26:10 2009	(r198007)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf_ruleset.c	Mon Oct 12 22:40:43 2009	(r198008)
@@ -53,9 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 
 #include <net/if.h>
-#ifdef __FreeBSD__
-#include <net/vnet.h>
-#endif
 #include <net/pfvar.h>
 
 #ifdef INET6
@@ -100,7 +97,7 @@ __FBSDID("$FreeBSD$");
 #endif /* _KERNEL */
 
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(_KERNEL)
 VNET_DEFINE(struct pf_anchor_global,	pf_anchors);
 VNET_DEFINE(struct pf_anchor,		pf_main_anchor);
 #else

Modified: user/eri/pf45/head/sys/contrib/pf/net/pfvar.h
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pfvar.h	Mon Oct 12 22:26:10 2009	(r198007)
+++ user/eri/pf45/head/sys/contrib/pf/net/pfvar.h	Mon Oct 12 22:40:43 2009	(r198008)
@@ -934,6 +934,7 @@ struct pfsync_state {
 } __packed;
 
 #ifdef __FreeBSD__
+#ifdef _KERNEL
 /* pfsync */
 typedef int     	pfsync_state_import_t(struct pfsync_state *, u_int8_t);
 typedef	void		pfsync_insert_state_t(struct pf_state *);
@@ -981,6 +982,7 @@ VNET_DECLARE(pflog_packet_t,		*pflog_pac
 
 /* pf uid hack */
 #define debug_pfugidhack                 VNET(debug_pfugidhack)
+#endif
 
 /* Macros to set/clear/test flags. */
 #ifdef _KERNEL
@@ -1218,8 +1220,10 @@ RB_HEAD(pfi_ifhead, pfi_kif);
 
 /* state tables */
 #ifdef __FreeBSD__
+#ifdef _KERNEL
 VNET_DECLARE(struct pf_state_tree,	 pf_statetbl);
 #define	pf_statetbl			 VNET(pf_statetbl)
+#endif
 #else
 extern struct pf_state_tree	 pf_statetbl;
 #endif
@@ -2143,10 +2147,12 @@ struct pf_fragment {
 #endif /* _KERNEL */
 
 #ifdef __FreeBSD__
+#ifdef _KERNEL
 VNET_DECLARE(struct pf_anchor_global,		 pf_anchors);
 #define	pf_anchors				 VNET(pf_anchors)
 VNET_DECLARE(struct pf_anchor,			 pf_main_anchor);
 #define	pf_main_anchor				 VNET(pf_main_anchor)
+#endif
 #else
 extern struct pf_anchor_global  pf_anchors;
 extern struct pf_anchor        pf_main_anchor;