apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r813582 - in /apr/apr/branches/1.4.x: ./ CHANGES STATUS configure.in
Date Thu, 10 Sep 2009 20:54:00 GMT
Author: jim
Date: Thu Sep 10 20:54:00 2009
New Revision: 813582

URL: http://svn.apache.org/viewvc?rev=813582&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.4.x/   (props changed)
    apr/apr/branches/1.4.x/CHANGES
    apr/apr/branches/1.4.x/STATUS
    apr/apr/branches/1.4.x/configure.in

Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 10 20:54:00 2009
@@ -1 +1 @@
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809854
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=813582&r1=813581&r2=813582&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Thu Sep 10 20:54:00 2009
@@ -5,6 +5,9 @@
      Fix overflow in pools and rmm, where size alignment was taking place.
      [Matt Lewis <mattlewis@google.com>, Sander Striker]
 
+  *) 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.4.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/STATUS?rev=813582&r1=813581&r2=813582&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/STATUS [utf-8] (original)
+++ apr/apr/branches/1.4.x/STATUS [utf-8] Thu Sep 10 20:54:00 2009
@@ -72,13 +72,6 @@
         trunk works
       +1: jim
 
-  * configure.in: Fix APR_OFF_T_FMT for Darwin 10 (10.6)
-      Trunk Version:
-        http://svn.apache.org/viewvc?view=rev&revision=809745
-        http://svn.apache.org/viewvc?view=rev&revision=810472
-      1.4 Version:
-        trunk works
-      +1: jim
 
 CURRENT test/testall -v EXCEPTIONS:
 

Modified: apr/apr/branches/1.4.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/configure.in?rev=813582&r1=813581&r2=813582&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/configure.in (original)
+++ apr/apr/branches/1.4.x/configure.in Thu Sep 10 20:54:00 2009
@@ -1616,6 +1616,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



Mime
View raw message