apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1493733 - /apr/apr/branches/1.5.x/include/apr_general.h
Date Mon, 17 Jun 2013 12:28:14 GMT
Author: trawick
Date: Mon Jun 17 12:28:14 2013
New Revision: 1493733

URL: http://svn.apache.org/r1493733
Log:
Merge r1493731 from trunk:

Fix compilation with FreeBSD on ARM.

Submitted by: Olli Hauer <ohauer gmx.de>
Reviewed by: trawick

Modified:
    apr/apr/branches/1.5.x/include/apr_general.h

Modified: apr/apr/branches/1.5.x/include/apr_general.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_general.h?rev=1493733&r1=1493732&r2=1493733&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_general.h (original)
+++ apr/apr/branches/1.5.x/include/apr_general.h Mon Jun 17 12:28:14 2013
@@ -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



Mime
View raw message