subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1417014 - in /subversion/trunk: ./ subversion/libsvn_subr/sqlite.c subversion/libsvn_subr/sqlite3wrapper.c
Date Tue, 04 Dec 2012 16:15:40 GMT
Author: brane
Date: Tue Dec  4 16:15:39 2012
New Revision: 1417014

URL: http://svn.apache.org/viewvc?rev=1417014&view=rev
Log:
Cherry-pick r1407642 from the wc-collate-path branch, with the following effect:

On the wc-collate-path branch: Move the amalgamated SQLite import to
a separate file to avoid having to wade through tons of warnings from
sqlite3.c every time I change some header that sqlite.c uses.

* subversion/libsvn_subr/sqlite3wrapper.c: New file. When SVN_SQLITE_INLINE
   is defined, include the amalgamated sqlite3.c here. Also define
   SQLITE_OMIT_DEPRECATED to not include deprecated APIs in the vtable.
  (sqlite3_api): Exported API vtable normally used by SQLite extensions.

* subversion/libsvn_subr/sqlite.c:  When SVN_SQLITE_INLINE is defined,
   define SQLITE_OMIT_DEPRECATED and include sqlite3ext.h to get the
   vtable devfinition, then ...
  (extern sqlite3_api): ... import the actual vtable from sqlite3wrapper.

Added:
    subversion/trunk/subversion/libsvn_subr/sqlite3wrapper.c
      - copied unchanged from r1407642, subversion/branches/wc-collate-path/subversion/libsvn_subr/sqlite3wrapper.c
Modified:
    subversion/trunk/   (props changed)
    subversion/trunk/subversion/libsvn_subr/sqlite.c

Propchange: subversion/trunk/
------------------------------------------------------------------------------
  Merged /subversion/branches/wc-collate-path:r1407642

Modified: subversion/trunk/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sqlite.c?rev=1417014&r1=1417013&r2=1417014&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sqlite.c Tue Dec  4 16:15:39 2012
@@ -43,14 +43,12 @@
 #endif
 
 #ifdef SVN_SQLITE_INLINE
-/* Include sqlite3 inline, making all symbols private. */
-  #define SQLITE_API static
-  #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-    #pragma GCC diagnostic ignored "-Wunused-function"
-  #endif
-  #include <sqlite3.c>
+/* Import the sqlite3 API vtable from sqlite3wrapper.c */
+#define SQLITE_OMIT_DEPRECATED
+#include <sqlite3ext.h>
+extern const sqlite3_api_routines *const sqlite3_api;
 #else
-  #include <sqlite3.h>
+#include <sqlite3.h>
 #endif
 
 #if !SQLITE_VERSION_AT_LEAST(3,7,12)



Mime
View raw message