Index: pfvar.h
===================================================================
RCS file: /cvs/src/sys/net/pfvar.h,v
retrieving revision 1.406
diff -u -p -r1.406 pfvar.h
--- pfvar.h	23 Dec 2014 03:24:08 -0000	1.406
+++ pfvar.h	24 Dec 2014 06:41:04 -0000
@@ -1036,10 +1036,7 @@ enum { PFR_FB_NONE, PFR_FB_MATCH, PFR_FB
 	PFR_FB_NOTMATCH, PFR_FB_CONFLICT, PFR_FB_NOCOUNT, PFR_FB_MAX };
 
 struct pfr_addr {
-	union {
-		struct in_addr	 _pfra_ip4addr;
-		struct in6_addr	 _pfra_ip6addr;
-	}		 pfra_u;
+	struct pf_addr	 pfra_u;
 	char		 pfra_ifname[IFNAMSIZ];
 	u_int32_t	 pfra_states;
 	u_int16_t	 pfra_weight;
@@ -1050,8 +1047,8 @@ struct pfr_addr {
 	u_int8_t	 pfra_type;
 	u_int8_t	 pad[7];
 };
-#define	pfra_ip4addr	pfra_u._pfra_ip4addr
-#define	pfra_ip6addr	pfra_u._pfra_ip6addr
+#define	pfra_ip4addr	pfra_u.v4
+#define	pfra_ip6addr	pfra_u.v6
 
 enum { PFR_DIR_IN, PFR_DIR_OUT, PFR_DIR_MAX };
 enum { PFR_OP_BLOCK, PFR_OP_MATCH, PFR_OP_PASS, PFR_OP_ADDR_MAX, PFR_OP_TABLE_MAX };