Fix builds with both SQLITE_ENABLE_MULTITHREADED_CHECKS and

SQLITE_THREADSAFE=0 defined.

FossilOrigin-Name: 7d0b12fcb58353b883ffce77df824a5cc8b1e913a21ec3f22fb73481a398c916

diff --git a/manifest b/manifest
index a55dbc7aa2e8a37df29ac817668f51b6fdf553bd..48f178e1ea84e9e210dac1d4d76e3238f16cae59 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sexperimental\sfeature\sto\sdetect\sthreading\sbugs\sin\sapps\sthat\suse\nSQLITE_CONFIG_MULTITHREADED.\sEnabled\sat\scompile\stime\susing\nSQLITE_ENABLE_MULTITHREADED_CHECKS.
-D 2017-11-25T17:51:01.072
+C Fix\sbuilds\swith\sboth\sSQLITE_ENABLE_MULTITHREADED_CHECKS\sand\nSQLITE_THREADSAFE=0\sdefined.
+D 2017-11-25T21:09:29.272
 F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e5d7606238f55816da99f719969598df5b091aa2e9a6935c9412fcae8f53fc44
@@ -476,7 +476,7 @@ F src/shell.c.in cb1b5e41ef9c081b2b8927ae32c9c384a9ec110ada808ebfe083ba7c8a19bbb
 F src/sqlite.h.in 8fd97993d48b50b9bade38c52f12d175942c9497c960905610c7b03a3e4b5818
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
-F src/sqliteInt.h 6b084f4b7c0ea0cde24f4400a88fca7108f1a304cb567338495bba46b0fd68c6
+F src/sqliteInt.h 4c910d9c0d88a90e8639a4f83ef05f701ccfe731cf593e757444074f01df4964
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1678,10 +1678,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 24d7058e2799133dd681d2fef341025ca50554861bb4cd39e93ee87ae1d8a605
-R 1e88d93b9907cb6e6661756c6df7c284
-T *branch * multithreaded-checks
-T *sym-multithreaded-checks *
-T -sym-trunk *
+P a66886ac13aa6d8ccbb6d673ddd00267c93e3ee1fbc158236fce3157d150868d
+R e1844ccd94c28116d72c961404a2fb64
 U dan
-Z 7380701e6ba5cd3f46b8984142176402
+Z 03bc6023c96e908c306e6b560dfce5a2

diff --git a/manifest.uuid b/manifest.uuid
index 99d6d7ea4cd52f0ca3f767a306f9a101dc05f641..ec64aba6fd5938553943542f38318b45cb8ad575 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a66886ac13aa6d8ccbb6d673ddd00267c93e3ee1fbc158236fce3157d150868d
\ No newline at end of file
+7d0b12fcb58353b883ffce77df824a5cc8b1e913a21ec3f22fb73481a398c916
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index c416754eed3ed2fed95a1df75877386ed60b18c9..27b896d67c72f5ae6a0aa41ae3eb34b76136d44b 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3590,7 +3590,7 @@ int sqlite3LookasideUsed(sqlite3*,int*);
 sqlite3_mutex *sqlite3Pcache1Mutex(void);
 sqlite3_mutex *sqlite3MallocMutex(void);
 
-#ifdef SQLITE_ENABLE_MULTITHREADED_CHECKS
+#if defined(SQLITE_ENABLE_MULTITHREADED_CHECKS) && !defined(SQLITE_MUTEX_OMIT)
 void sqlite3MutexWarnOnContention(sqlite3_mutex*);
 #else
 # define sqlite3MutexWarnOnContention(x)