summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/sql/connection.cc4
-rw-r--r--third_party/sqlite/sqlite3.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/sql/connection.cc b/app/sql/connection.cc
index 6691252..0217b4e 100644
--- a/app/sql/connection.cc
+++ b/app/sql/connection.cc
@@ -130,7 +130,11 @@ void Connection::Preload() {
if (!dummy || !dummy.Step())
return;
+#if !defined(USE_SYSTEM_SQLITE)
+ // This function is only defined in Chromium's version of sqlite.
+ // Do not call it when using system sqlite.
sqlite3Preload(db_);
+#endif
}
bool Connection::BeginTransaction() {
diff --git a/third_party/sqlite/sqlite3.h b/third_party/sqlite/sqlite3.h
index 2072899..2ae3410 100644
--- a/third_party/sqlite/sqlite3.h
+++ b/third_party/sqlite/sqlite3.h
@@ -11,10 +11,6 @@
#if defined(USE_SYSTEM_SQLITE)
#include <sqlite3.h>
-
-// A no-op implementation of database preloading (not available
-// when using system sqlite).
-static int sqlite3Preload(sqlite3 *db) { return SQLITE_OK; }
#else
#include "third_party/sqlite/preprocessed/sqlite3.h"
#endif