You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ji...@apache.org on 2009/09/10 23:05:53 UTC
svn commit: r813588 - in /apr/apr/branches/1.3.x: CHANGES configure.in
Author: jim
Date: Thu Sep 10 21:05:52 2009
New Revision: 813588
URL: http://svn.apache.org/viewvc?rev=813588&view=rev
Log:
Merge r809745, r810472 from trunk:
This is the right one...
Fix APR_OFF_T_FMT which is lld for OS X 10.6 (darwin 10.0.0)
since off_t ends up as a long long.
predict future and keep mr rowe happy
Reviewed/backported by: jim
Modified:
apr/apr/branches/1.3.x/CHANGES
apr/apr/branches/1.3.x/configure.in
Modified: apr/apr/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?rev=813588&r1=813587&r2=813588&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.3.x/CHANGES [utf-8] Thu Sep 10 21:05:52 2009
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes for APR 1.3.9
+ *) Better handling of APR_OFF_T_FMT for Darwin 10 depending on -arch
+ setting of compiler [Jim Jagielski]
+
*) Add comments describing the thread-safety properties of apr_pool_t.
[Neil Conway nrc cs.berkeley.edu]
Modified: apr/apr/branches/1.3.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/configure.in?rev=813588&r1=813587&r2=813588&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/configure.in (original)
+++ apr/apr/branches/1.3.x/configure.in Thu Sep 10 21:05:52 2009
@@ -1613,6 +1613,15 @@
else
AC_ERROR([could not determine the size of off_t])
fi
+ # Per OS tuning...
+ case $host in
+ *apple-darwin10.*)
+ # off_t is a long long, but long == long long
+ if test "$ac_cv_sizeof_long" = "$ac_cv_sizeof_long_long"; then
+ off_t_fmt='#define APR_OFF_T_FMT "lld"'
+ fi
+ ;;
+ esac
else
# Fallback on int
off_t_value=apr_int32_t