diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 09:30:37 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 09:30:37 +0000 |
| commit | 82b39cbbab422e8a5f696d14c7b3546c98a05fe4 (patch) | |
| tree | 9716642a5d63f5731a90c97084a29b6932713da6 /third_party/sqlite | |
| parent | 00d0ac2b32a0e0c7e064ea2753d7efc6789af09a (diff) | |
| download | chromium_src-82b39cbbab422e8a5f696d14c7b3546c98a05fe4.zip chromium_src-82b39cbbab422e8a5f696d14c7b3546c98a05fe4.tar.gz chromium_src-82b39cbbab422e8a5f696d14c7b3546c98a05fe4.tar.bz2 | |
Allow building with system-provided sqlite. Last change (tm).
This is upstreaming a Gentoo Linux patch.
This patch prevents having multiple conflicting copies of sqlite3Preload at link time, and also fixes a dependency problem that could result in a header mismatch. The gyp file change ensures that we propagate the USE_SYSTEM_SQLITE preprocessor symbol to all targets that need it.
BUG=22208
TEST=none
Review URL: http://codereview.chromium.org/3519002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite')
| -rw-r--r-- | third_party/sqlite/sqlite3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/sqlite/sqlite3.h b/third_party/sqlite/sqlite3.h index 812939d..2072899 100644 --- a/third_party/sqlite/sqlite3.h +++ b/third_party/sqlite/sqlite3.h @@ -14,7 +14,7 @@ // A no-op implementation of database preloading (not available // when using system sqlite). -int sqlite3Preload(sqlite3 *db) { return SQLITE_OK; } +static int sqlite3Preload(sqlite3 *db) { return SQLITE_OK; } #else #include "third_party/sqlite/preprocessed/sqlite3.h" #endif |