Index: if_pfsync.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/pf/net/if_pfsync.c,v
retrieving revision 1.9
diff -u -r1.9 if_pfsync.c
--- if_pfsync.c	22 Jun 2004 20:13:24 -0000	1.9
+++ if_pfsync.c	28 Jul 2004 05:19:03 -0000
@@ -1311,7 +1311,7 @@
 	struct pfsync_header *h;
 	struct pfsync_softc *sc = ifp->if_softc;
 	struct pfsync_state_upd_req *rup;
-	int s, ret = 0;		/* make the compiler happy */
+	int s = 0, ret = 0;	/* make the compiler happy */
 
 #ifdef __FreeBSD__
 	PF_ASSERT(MA_OWNED);
Index: pf.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/pf/net/pf.c,v
retrieving revision 1.16
diff -u -r1.16 pf.c
--- pf.c	23 Jul 2004 03:31:42 -0000	1.16
+++ pf.c	28 Jul 2004 05:19:03 -0000
@@ -292,6 +292,7 @@
 	((r)->rule_flag & PFRULE_GRBOUND) ? (k)->pfik_parent :	       \
 	(k)->pfik_parent->pfik_parent)
 
+#ifndef __FreeBSD__
 static __inline int pf_src_compare(struct pf_src_node *, struct pf_src_node *);
 static __inline int pf_state_compare_lan_ext(struct pf_state *,
 	struct pf_state *);
@@ -299,6 +300,15 @@
 	struct pf_state *);
 static __inline int pf_state_compare_id(struct pf_state *,
 	struct pf_state *);
+#else
+static int pf_src_compare(struct pf_src_node *, struct pf_src_node *);
+static int pf_state_compare_lan_ext(struct pf_state *,
+	struct pf_state *);
+static int pf_state_compare_ext_gwy(struct pf_state *,
+	struct pf_state *);
+static int pf_state_compare_id(struct pf_state *,
+	struct pf_state *);
+#endif
 
 struct pf_src_tree tree_src_tracking;
 
Index: pf_norm.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/pf/net/pf_norm.c,v
retrieving revision 1.7
diff -u -r1.7 pf_norm.c
--- pf_norm.c	17 Jun 2004 16:59:47 -0000	1.7
+++ pf_norm.c	28 Jul 2004 05:19:03 -0000
@@ -155,8 +155,13 @@
 TAILQ_HEAD(pf_fragqueue, pf_fragment)	pf_fragqueue;
 TAILQ_HEAD(pf_cachequeue, pf_fragment)	pf_cachequeue;
 
+#ifndef __FreeBSD__
 static __inline int	 pf_frag_compare(struct pf_fragment *,
 			    struct pf_fragment *);
+#else
+static int	 pf_frag_compare(struct pf_fragment *,
+			    struct pf_fragment *);
+#endif
 RB_HEAD(pf_frag_tree, pf_fragment)	pf_frag_tree, pf_cache_tree;
 RB_PROTOTYPE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare);
 RB_GENERATE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare);
Index: pf_table.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/pf/net/pf_table.c,v
retrieving revision 1.4
diff -u -r1.4 pf_table.c
--- pf_table.c	16 Jun 2004 23:24:00 -0000	1.4
+++ pf_table.c	28 Jul 2004 05:19:03 -0000
@@ -275,6 +275,7 @@
 	pfr_enqueue_addrs(kt, &workq, ndel, 0);
 
 	if (!(flags & PFR_FLAG_DUMMY)) {
+		s = 0;
 		if (flags & PFR_FLAG_ATOMIC)
 			s = splsoftnet();
 		pfr_remove_kentries(kt, &workq);
@@ -297,7 +298,7 @@
 	struct pfr_kentryworkq	 workq;
 	struct pfr_kentry	*p, *q;
 	struct pfr_addr		 ad;
-	int			 i, rv, s, xadd = 0;
+	int			 i, rv, s = 0, xadd = 0;
 #ifdef __FreeBSD__
 	/*
 	 * XXX Is it OK under LP64 environments?
@@ -383,7 +384,7 @@
 	struct pfr_kentryworkq	 workq;
 	struct pfr_kentry	*p;
 	struct pfr_addr		 ad;
-	int			 i, rv, s, xdel = 0;
+	int			 i, rv, s = 0, xdel = 0;
 
 	ACCEPT_FLAGS(PFR_FLAG_ATOMIC+PFR_FLAG_DUMMY+PFR_FLAG_FEEDBACK);
 	if (pfr_validate_table(tbl, 0, flags & PFR_FLAG_USERIOCTL))
@@ -445,7 +446,7 @@
 	struct pfr_kentryworkq	 addq, delq, changeq;
 	struct pfr_kentry	*p, *q;
 	struct pfr_addr		 ad;
-	int			 i, rv, s, xadd = 0, xdel = 0, xchange = 0;
+	int			 i, rv, s = 0, xadd = 0, xdel = 0, xchange = 0;
 #ifdef __FreeBSD__
 	/*
 	 * XXX Is it OK under LP64 environments?
@@ -649,7 +650,7 @@
 	struct pfr_ktable	*kt;
 	struct pfr_walktree	 w;
 	struct pfr_kentryworkq	 workq;
-	int			 rv, s;
+	int			 rv, s = 0;
 #ifdef __FreeBSD__
 	/*
 	 * XXX Is it OK under LP64 environments?
@@ -715,7 +716,7 @@
 	struct pfr_kentryworkq	 workq;
 	struct pfr_kentry	*p;
 	struct pfr_addr		 ad;
-	int			 i, rv, s, xzero = 0;
+	int			 i, rv, s = 0, xzero = 0;
 
 	ACCEPT_FLAGS(PFR_FLAG_ATOMIC+PFR_FLAG_DUMMY+PFR_FLAG_FEEDBACK);
 	if (pfr_validate_table(tbl, 0, 0))
@@ -1182,7 +1183,7 @@
 {
 	struct pfr_ktableworkq	 workq;
 	struct pfr_ktable	*p;
-	int			 s, xdel = 0;
+	int			 s = 0, xdel = 0;
 
 	ACCEPT_FLAGS(PFR_FLAG_ATOMIC+PFR_FLAG_DUMMY+PFR_FLAG_ALLRSETS);
 	if (pfr_table_count(filter, flags) < 0)
@@ -1217,7 +1218,7 @@
 {
 	struct pfr_ktableworkq	 addq, changeq;
 	struct pfr_ktable	*p, *q, *r, key;
-	int			 i, rv, s, xadd = 0;
+	int			 i, rv, s = 0, xadd = 0;
 #ifdef __FreeBSD__
 	/*
 	 * XXX Is it OK under LP64 environments?
@@ -1305,7 +1306,7 @@
 {
 	struct pfr_ktableworkq	 workq;
 	struct pfr_ktable	*p, *q, key;
-	int			 i, s, xdel = 0;
+	int			 i, s = 0, xdel = 0;
 
 	ACCEPT_FLAGS(PFR_FLAG_ATOMIC+PFR_FLAG_DUMMY);
 	SLIST_INIT(&workq);
@@ -1377,7 +1378,7 @@
 {
 	struct pfr_ktable	*p;
 	struct pfr_ktableworkq	 workq;
-	int			 s, n, nn;
+	int			 s = 0, n, nn;
 #ifdef __FreeBSD__
 	/*
 	 * XXX Is it OK under LP64 environments?
@@ -1407,7 +1408,8 @@
 		if (!(flags & PFR_FLAG_ATOMIC))
 			s = splsoftnet();
 		if (COPYOUT(&p->pfrkt_ts, tbl++, sizeof(*tbl))) {
-			splx(s);
+			if (!(flags & PFR_FLAG_ATOMIC))
+				splx(s);
 			return (EFAULT);
 		}
 		if (!(flags & PFR_FLAG_ATOMIC))
@@ -1432,7 +1434,7 @@
 {
 	struct pfr_ktableworkq	 workq;
 	struct pfr_ktable	*p, key;
-	int			 i, s, xzero = 0;
+	int			 i, s = 0, xzero = 0;
 #ifdef __FreeBSD__
 	/*
 	 * XXX Is it OK under LP64 environments?
@@ -1473,7 +1475,7 @@
 {
 	struct pfr_ktableworkq	 workq;
 	struct pfr_ktable	*p, *q, key;
-	int			 i, s, xchange = 0, xdel = 0;
+	int			 i, s = 0, xchange = 0, xdel = 0;
 
 	ACCEPT_FLAGS(PFR_FLAG_ATOMIC+PFR_FLAG_DUMMY);
 	if ((setflag & ~PFR_TFLAG_USRMASK) ||
@@ -1692,7 +1694,7 @@
 	struct pfr_ktable	*p;
 	struct pfr_ktableworkq	 workq;
 	struct pf_ruleset	*rs;
-	int			 s, xadd = 0, xchange = 0;
+	int			 s = 0, xadd = 0, xchange = 0;
 #ifdef __FreeBSD__
 	/*
 	 * XXX Is it OK under LP64 environments?