Date: Wed, 14 Dec 2011 12:46:37 +1100 From: Peter Jeremy <peterjeremy@acm.org> To: "Bjoern A. Zeeb" <bz@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: 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... Message-ID: <20111214014637.GA30470@server.vk2pj.dyndns.org> In-Reply-To: <201106281157.p5SBvP5g048097@svn.freebsd.org> References: <201106281157.p5SBvP5g048097@svn.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On 2011-Jun-28 11:57:25 +0000, "Bjoern A. Zeeb" <bz@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 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk7n//0ACgkQ/opHv/APuIemCACgh9jG2AMCfYPCa7YpMIa9KKCo nEQAoLXoVgjrEVUP1595zOx2nmBVGGnz =kfHx -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111214014637.GA30470>