diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-29 18:22:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-11 11:34:17 +0100 |
| commit | 00d26a728db2814620f390b418a7d6325ce5aca6 (patch) | |
| tree | 1a08a766ac3682d979bba42bb32150b3e6b93fdc /app | |
| parent | b3a45980d5cfbb62c937045255faa29a8ffea9f3 (diff) | |
| download | external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.zip external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.tar.gz external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.tar.bz2 | |
Collection of all the changs to external chromium.
Time is running out, I guess we have to submit this and remember to upstream.
Rebased to chromium r53293
Change-Id: Ie61ca0433b1eedd90144aee87c5efcd68fdc37ac
Diffstat (limited to 'app')
| -rw-r--r-- | app/sql/connection.cc | 13 | ||||
| -rw-r--r-- | app/sql/statement.cc | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/app/sql/connection.cc b/app/sql/connection.cc index 81f3d36..ba40a11 100644 --- a/app/sql/connection.cc +++ b/app/sql/connection.cc @@ -11,7 +11,11 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#ifdef ANDROID +#include "sqlite3.h" +#else #include "third_party/sqlite/preprocessed/sqlite3.h" +#endif namespace sql { @@ -81,6 +85,15 @@ void Connection::Close() { } } +#ifdef ANDROID +// Other platforms may need this ??? +// This function is a local change to sqlite3 which doesn't exist when one is +// using the system sqlite library. Thus, we stub it out here. +int sqlite3Preload(sqlite3* db) { + return 0; +} +#endif + void Connection::Preload() { if (!db_) { NOTREACHED(); diff --git a/app/sql/statement.cc b/app/sql/statement.cc index 639b02d..4ac9c2e 100644 --- a/app/sql/statement.cc +++ b/app/sql/statement.cc @@ -6,7 +6,11 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" +#ifdef ANDROID +#include "sqlite3.h" +#else #include "third_party/sqlite/preprocessed/sqlite3.h" +#endif namespace sql { |