subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From luke1...@apache.org
Subject svn commit: r1753130 - /subversion/branches/1.7.x-sqlite-3.12/subversion/libsvn_subr/sqlite.c
Date Sun, 17 Jul 2016 21:55:11 GMT
Author: luke1410
Date: Sun Jul 17 21:55:11 2016
New Revision: 1753130

URL: http://svn.apache.org/viewvc?rev=1753130&view=rev
Log:
On the 1.7.x-sqlite-3.12 branch: Fix compiling error using Visual Studio 2005+
and SQLite amalgamation 3.12.0+.

* subversion/libsvn_subr/sqlite.c: include sqlite related files prior to apr
  includes.

Suggested by: rhuijben

Modified:
    subversion/branches/1.7.x-sqlite-3.12/subversion/libsvn_subr/sqlite.c

Modified: subversion/branches/1.7.x-sqlite-3.12/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-sqlite-3.12/subversion/libsvn_subr/sqlite.c?rev=1753130&r1=1753129&r2=1753130&view=diff
==============================================================================
--- subversion/branches/1.7.x-sqlite-3.12/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/branches/1.7.x-sqlite-3.12/subversion/libsvn_subr/sqlite.c Sun Jul 17 21:55:11
2016
@@ -19,6 +19,13 @@
  *    under the License.
  * ====================================================================
  */
+#ifdef SVN_SQLITE_INLINE
+/* Include sqlite3 inline, making all symbols private. */
+  #define SQLITE_API static
+  #include <sqlite3.c>
+#else
+  #include <sqlite3.h>
+#endif
 
 #include <apr_pools.h>
 
@@ -42,14 +49,6 @@
 #include "private/svn_debug.h"
 #endif
 
-#ifdef SVN_SQLITE_INLINE
-/* Include sqlite3 inline, making all symbols private. */
-  #define SQLITE_API static
-  #include <sqlite3.c>
-#else
-  #include <sqlite3.h>
-#endif
-
 #if !SQLITE_VERSION_AT_LEAST(3,6,18)
 #error SQLite is too old -- version 3.6.18 is the minimum required version
 #endif



Mime
View raw message