5.1->5.2

[Matt Freitag]

Building 5.2-RELEASE from 5.1-RELEASE-p10 w/ipf+ipfw+ipfw6+dummynet, 5.1 
Compiled fine with this setup.
I need ipfilter as it's doing my source routing for ipv6 (multiple 
transits) since ip6fw doesn't support fwd. (I just use ip6fw for 
filtering, and ipf for forwarding to the correct interface according to 
source)
Am I just being stupid here somehow?

<snip>
cc -c -O -pipe -mcpu=pentiumpro -Wall -Wredundant-decls -Wnested-externs 
-Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline 
-Wcast-qual  -fformat-extensions -std=c99 -g -nostdinc -I-  -I. 
-I../../.. -I../../../contrib/dev/acpica -I../../../contrib/ipfilter 
-I../../../contrib/dev/ath -I../../../contrib/dev/ath/freebsd 
-I../../../contrib/ngatm -D_KERNEL -include opt_global.h -fno-common 
-finline-limit=15000 -fno-strict-aliasing  -mno-align-long-strings 
-mpreferred-stack-boundary=2 -ffreestanding -Werror  
../../../contrib/ipfilter/netinet/ip_fil.c
../../../contrib/ipfilter/netinet/ip_fil.c: In function `fr_check_wrapper':
../../../contrib/ipfilter/netinet/ip_fil.c:319: `PFIL_OUT' undeclared 
(first use in this function)
../../../contrib/ipfilter/netinet/ip_fil.c:319: (Each undeclared 
identifier is reported only once
../../../contrib/ipfilter/netinet/ip_fil.c:319: for each function it 
appears in.)
../../../contrib/ipfilter/netinet/ip_fil.c: In function `fr_check_wrapper6':
../../../contrib/ipfilter/netinet/ip_fil.c:329: `PFIL_OUT' undeclared 
(first use in this function)
cc1: warnings being treated as errors
../../../contrib/ipfilter/netinet/ip_fil.c: In function `iplattach':
../../../contrib/ipfilter/netinet/ip_fil.c:376: warning: unused variable 
`ph_inet'
../../../contrib/ipfilter/netinet/ip_fil.c:378: warning: unused variable 
`ph_inet6'
machine/in_cksum.h: At top level:
../../../contrib/ipfilter/netinet/ip_fil.c:317: warning: 
`fr_check_wrapper' defined but not used
../../../contrib/ipfilter/netinet/ip_fil.c:327: warning: 
`fr_check_wrapper6' defined but not used
*** Error code 1

Stop in /usr/src/sys/i386/compile/funk.

<snip>

-mpf