From owner-freebsd-openoffice@FreeBSD.ORG  Mon Jul 31 23:49:34 2006
Return-Path: <owner-freebsd-openoffice@FreeBSD.ORG>
X-Original-To: freebsd-openoffice@freebsd.org
Delivered-To: freebsd-openoffice@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1C31E16A4DD
	for <freebsd-openoffice@freebsd.org>;
	Mon, 31 Jul 2006 23:49:34 +0000 (UTC)
	(envelope-from stephen@math.missouri.edu)
Received: from sccmmhc92.asp.att.net (sccmmhc92.asp.att.net [204.127.203.212])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BADF943D45
	for <freebsd-openoffice@freebsd.org>;
	Mon, 31 Jul 2006 23:49:33 +0000 (GMT)
	(envelope-from stephen@math.missouri.edu)
Received: from [10.0.0.4] (12-216-254-44.client.mchsi.com[12.216.254.44])
	by sccmmhc92.asp.att.net (sccmmhc92) with ESMTP
	id <20060731234932m92002sbuve>; Mon, 31 Jul 2006 23:49:32 +0000
Message-ID: <44CE970C.3050509@math.missouri.edu>
Date: Mon, 31 Jul 2006 18:49:32 -0500
From: Stephen Montgomery-Smith <stephen@math.missouri.edu>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.13) Gecko/20060728
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: freebsd-openoffice@freebsd.org
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Recent patch to openoffice-2.0
X-BeenThere: freebsd-openoffice@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting OpenOffice to FreeBSD <freebsd-openoffice.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice>, 
	<mailto:freebsd-openoffice-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-openoffice>
List-Post: <mailto:freebsd-openoffice@freebsd.org>
List-Help: <mailto:freebsd-openoffice-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice>, 
	<mailto:freebsd-openoffice-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Jul 2006 23:49:34 -0000

patch-i65512 has lines like

#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || 
(__FreeBSD_version < 601103)

Shouldn't it be something like

#if !defined(FREEBSD) || ((__FreeBSD_version >= 700000) && 
(__FreeBSD_version < 700015)|| (__FreeBSD_version < 601103)

If you are running version 601103 (as I am) the former line fails miserably.

Thanks Stephen