svn commit: r223637 - in head: . contrib/pf/authpf contrib/pf/ftp-proxy contrib/pf/man contrib/pf/pfctl contrib/pf/pflogd sbin/pflogd sys/conf sys/contrib/altq/altq sys/contrib/pf/net sys/modules s...

[Peter Jeremy]

On 2011-Jun-28 11:57:25 +0000, "Bjoern A. Zeeb" <bz at FreeBSD.org> wrote:
>Author: bz
>Date: Tue Jun 28 11:57:25 2011
>New Revision: 223637
>URL: http://svn.freebsd.org/changeset/base/223637
>
>Log:
>  Update packet filter (pf) code to OpenBSD 4.5.

This is very belated but I've just found the following preprocessor
conditionals in sys/contrib/pf/net/pfvar.h as a result of this
commit (covering lines 214..282):
#ifdef __FreeBSD__
...
#ifdef __FreeBSD__
...
#else
...
#endif /* __FreeBSD__ */
...
#endif /* __FreeBSD__ */

Was there a mismerge here?

-- 
Peter Jeremy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-head/attachments/20111214/f420be67/attachment.pgp