From owner-svn-src-head@FreeBSD.ORG  Wed Dec 14 01:46:42 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F30D41065793;
	Wed, 14 Dec 2011 01:46:41 +0000 (UTC)
	(envelope-from peterjeremy@acm.org)
Received: from mail34.syd.optusnet.com.au (mail34.syd.optusnet.com.au
	[211.29.133.218])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B1F78FC08;
	Wed, 14 Dec 2011 01:46:41 +0000 (UTC)
Received: from server.vk2pj.dyndns.org
	(c220-239-116-103.belrs4.nsw.optusnet.com.au [220.239.116.103])
	by mail34.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id
	pBE1kcCw029225
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Wed, 14 Dec 2011 12:46:39 +1100
X-Bogosity: Ham, spamicity=0.000000
Received: from server.vk2pj.dyndns.org (localhost.vk2pj.dyndns.org [127.0.0.1])
	by server.vk2pj.dyndns.org (8.14.5/8.14.4) with ESMTP id pBE1kbfR030500;
	Wed, 14 Dec 2011 12:46:37 +1100 (EST)
	(envelope-from peter@server.vk2pj.dyndns.org)
Received: (from peter@localhost)
	by server.vk2pj.dyndns.org (8.14.5/8.14.4/Submit) id pBE1kb23030499;
	Wed, 14 Dec 2011 12:46:37 +1100 (EST) (envelope-from peter)
Date: Wed, 14 Dec 2011 12:46:37 +1100
From: Peter Jeremy <peterjeremy@acm.org>
To: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Message-ID: <20111214014637.GA30470@server.vk2pj.dyndns.org>
References: <201106281157.p5SBvP5g048097@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="/04w6evG8XlLl3ft"
Content-Disposition: inline
In-Reply-To: <201106281157.p5SBvP5g048097@svn.freebsd.org>
X-PGP-Key: http://members.optusnet.com.au/peterjeremy/pubkey.asc
User-Agent: Mutt/1.5.21 (2010-09-15)
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...
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Dec 2011 01:46:42 -0000


--/04w6evG8XlLl3ft
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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__
=2E..
#ifdef __FreeBSD__
=2E..
#else
=2E..
#endif /* __FreeBSD__ */
=2E..
#endif /* __FreeBSD__ */

Was there a mismerge here?

--=20
Peter Jeremy

--/04w6evG8XlLl3ft
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (FreeBSD)

iEYEARECAAYFAk7n//0ACgkQ/opHv/APuIemCACgh9jG2AMCfYPCa7YpMIa9KKCo
nEQAoLXoVgjrEVUP1595zOx2nmBVGGnz
=kfHx
-----END PGP SIGNATURE-----

--/04w6evG8XlLl3ft--