From owner-svn-src-all@FreeBSD.ORG  Thu Jun 20 02:22:02 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8639F6B8;
 Thu, 20 Jun 2013 02:22:02 +0000 (UTC)
 (envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 665851D0A;
 Thu, 20 Jun 2013 02:04:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5K244x1078401;
 Thu, 20 Jun 2013 02:04:04 GMT
 (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5K244tm078400;
 Thu, 20 Jun 2013 02:04:04 GMT
 (envelope-from kientzle@svn.freebsd.org)
Message-Id: <201306200204.r5K244tm078400@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Thu, 20 Jun 2013 02:04:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252013 - head/contrib/apr/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Jun 2013 02:22:02 -0000

Author: kientzle
Date: Thu Jun 20 02:04:03 2013
New Revision: 252013
URL: http://svnweb.freebsd.org/changeset/base/252013

Log:
  Try to fix build of apr on FreeBSD/arm.

Modified:
  head/contrib/apr/include/apr_general.h

Modified: head/contrib/apr/include/apr_general.h
==============================================================================
--- head/contrib/apr/include/apr_general.h	Thu Jun 20 00:00:33 2013	(r252012)
+++ head/contrib/apr/include/apr_general.h	Thu Jun 20 02:04:03 2013	(r252013)
@@ -76,7 +76,7 @@ typedef int               apr_signum_t;
  * @return offset
  */
 
-#if defined(CRAY) || (defined(__arm) && !defined(LINUX))
+#if defined(CRAY) || (defined(__arm) && !defined(LINUX) && !defined(__FreeBSD__))
 #ifdef __STDC__
 #define APR_OFFSET(p_type,field) _Offsetof(p_type,field)
 #else