diff options
| author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 14:33:32 +0000 |
|---|---|---|
| committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 14:33:32 +0000 |
| commit | 4176eee4b309db79df593b7671186907159b8a14 (patch) | |
| tree | 2a3c29b21e8e9fe17dcf29a4e01294cd35338a98 /app/sql | |
| parent | 110464a938291b333c54eaaab8a5383570247dc7 (diff) | |
| download | chromium_src-4176eee4b309db79df593b7671186907159b8a14.zip chromium_src-4176eee4b309db79df593b7671186907159b8a14.tar.gz chromium_src-4176eee4b309db79df593b7671186907159b8a14.tar.bz2 | |
Call sqlite3Preload() only when not using system sqlite. Modify the
sqlite3.h header to not include a stub definition of sqlite3Preload().
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6356012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/sql')
| -rw-r--r-- | app/sql/connection.cc | 4 |
1 files changed, 4 insertions, 0 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() { |