diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2013-06-17 12:29:29 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2013-06-17 12:29:29 +0000 |
| commit | 43348f7721192180597f28ba15289524f44da36f (patch) | |
| tree | 42f4d6bf1bb6df6c581ca8d2dd1bc58cdc2c0298 | |
| parent | b43a693865d015fed6d5db91e18149030a10d4eb (diff) | |
| download | libapr-43348f7721192180597f28ba15289524f44da36f.tar.gz | |
Merge r1493731 from trunk:
Fix compilation with FreeBSD on ARM.
Submitted by: Olli Hauer <ohauer gmx.de>
Reviewed by: trawick
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1493734 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | include/apr_general.h | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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] diff --git a/include/apr_general.h b/include/apr_general.h index 1ead8b665..c7389ec92 100644 --- a/include/apr_general.h +++ b/include/apr_general.h @@ -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 |