apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1493734 - in /apr/apr/branches/1.4.x: CHANGES include/apr_general.h
Date Mon, 17 Jun 2013 12:29:30 GMT
Author: trawick
Date: Mon Jun 17 12:29:29 2013
New Revision: 1493734

URL: http://svn.apache.org/r1493734
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.4.x/CHANGES
    apr/apr/branches/1.4.x/include/apr_general.h

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=1493734&r1=1493733&r2=1493734&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Mon Jun 17 12:29:29 2013
@@ -1,6 +1,8 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.4.8
 
+  *) Fix compiltation with FreeBSD on ARM.  [Olli Hauer <ohauer gmx.de>]
+
   *) Fix 1.4.7 regression in apr_mcast_hops() and apr_mcast_loopback()
      for AF_INET (IPv4) sockets on most Unix platforms.  [Joe Orton]
 

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