diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-31 15:40:09 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:20:23 +0200 |
| commit | a43d59bcbf8647bffb405cc3ce2951e4a4d12985 (patch) | |
| tree | d987c6e35290d96a0ac6d0e52401ba43cc996ae7 /storage | |
| parent | ac6896b599d55ee6c8cae02772f7d9926b9eee15 (diff) | |
| download | UXP-a43d59bcbf8647bffb405cc3ce2951e4a4d12985.tar UXP-a43d59bcbf8647bffb405cc3ce2951e4a4d12985.tar.gz UXP-a43d59bcbf8647bffb405cc3ce2951e4a4d12985.tar.lz UXP-a43d59bcbf8647bffb405cc3ce2951e4a4d12985.tar.xz UXP-a43d59bcbf8647bffb405cc3ce2951e4a4d12985.zip | |
Issue #1342 - Remove support for system sqlite
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/SQLiteMutex.h | 2 | ||||
| -rw-r--r-- | storage/moz.build | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/storage/SQLiteMutex.h b/storage/SQLiteMutex.h index a38525fd6..eaa69eab1 100644 --- a/storage/SQLiteMutex.h +++ b/storage/SQLiteMutex.h @@ -50,7 +50,7 @@ public: mMutex = aMutex; } -#if !defined(DEBUG) || defined(MOZ_SYSTEM_SQLITE) +#if !defined(DEBUG) /** * Acquires the mutex. */ diff --git a/storage/moz.build b/storage/moz.build index 5ccfabd71..2d30a85ec 100644 --- a/storage/moz.build +++ b/storage/moz.build @@ -100,10 +100,6 @@ if CONFIG['MOZ_MEMORY']: DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000 # See Sqlite moz.build for reasoning about TEMP_STORE. -# For system sqlite we cannot use the compile time option, so we use a pragma. -if CONFIG['MOZ_SYSTEM_SQLITE'] and (CONFIG['OS_TARGET'] == 'Android' - or CONFIG['HAVE_64BIT_BUILD']): - DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True LOCAL_INCLUDES += [ '/db/sqlite3/src', |