You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/05/27 06:01:42 UTC
svn commit: r1486508 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_subr/sqlite3wrapper.c
subversion/tests/libsvn_wc/wc-queries-test.c
Author: svn-role
Date: Mon May 27 04:01:42 2013
New Revision: 1486508
URL: http://svn.apache.org/r1486508
Log:
Merge r1480149 from trunk:
* r1480149
Fix a build problem on OS X 10.5.
Justification:
Necessary for building on PPC Macs.
Votes:
+1: mattiase (non-binding)
+1: rhuijben, breser, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/sqlite3wrapper.c
subversion/branches/1.8.x/subversion/tests/libsvn_wc/wc-queries-test.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1480149
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1486508&r1=1486507&r2=1486508&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon May 27 04:01:42 2013
@@ -105,14 +105,6 @@ Approved changes:
# blocking issues. If in doubt see this link for details:
# http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
- * r1480149
- Fix a build problem on OS X 10.5.
- Justification:
- Necessary for building on PPC Macs.
- Votes:
- +1: mattiase (non-binding)
- +1: rhuijben, breser, stefan2
-
* r1485447, r1485449
Make 'SQLITE_VERSION=3.7.15.1 ./get-deps.sh' work.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/sqlite3wrapper.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/sqlite3wrapper.c?rev=1486508&r1=1486507&r2=1486508&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/sqlite3wrapper.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/sqlite3wrapper.c Mon May 27 04:01:42 2013
@@ -39,6 +39,17 @@
# pragma GCC diagnostic ignored "-Wshorten-64-to-32"
# endif
# endif
+# ifdef __APPLE__
+# include <Availability.h>
+# if __MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+ /* <libkern/OSAtomic.h> is included on OS X by sqlite3.c, and
+ on old systems (Leopard or older), it cannot be compiled
+ with -std=c89 because it uses inline. This is a work-around. */
+# define inline __inline__
+# include <libkern/OSAtomic.h>
+# undef inline
+# endif
+# endif
# include <sqlite3.c>
# if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6))
# pragma GCC diagnostic pop
Modified: subversion/branches/1.8.x/subversion/tests/libsvn_wc/wc-queries-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1486508&r1=1486507&r2=1486508&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/libsvn_wc/wc-queries-test.c (original)
+++ subversion/branches/1.8.x/subversion/tests/libsvn_wc/wc-queries-test.c Mon May 27 04:01:42 2013
@@ -32,6 +32,17 @@
#ifdef SVN_SQLITE_INLINE
/* Include sqlite3 inline, making all symbols private. */
#define SQLITE_API static
+ #ifdef __APPLE__
+ #include <Availability.h>
+ #if __MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+ /* <libkern/OSAtomic.h> is included on OS X by sqlite3.c, and
+ on old systems (Leopard or older), it cannot be compiled
+ with -std=c89 because it uses inline. This is a work-around. */
+ #define inline __inline__
+ #include <libkern/OSAtomic.h>
+ #undef inline
+ #endif
+ #endif
#include <sqlite3.c>
#else
#include <sqlite3.h>