Fix a compilation problem when both SQLITE_ENABLE_MULTITHREADED_CHECKS and

SQLITE_ENABLE_API_ARMOUR are defined.

FossilOrigin-Name: 0342ce510d2063a63839399a2cfa25b7fc02f4fde17764082676b332d6136241

diff --git a/manifest b/manifest
index 59176fbb68f4e4b259b39f2dde20d9044ca53329..f5ffa7a07d9f27b1615a837e4e906ce45acee451 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\s".lint\sfkey-indexes"\sshell\scommand\sso\sthat\sit\sworks\swith\sWITHOUT\sROWID\ntables.
-D 2017-12-01T18:40:18.535
+C Fix\sa\scompilation\sproblem\swhen\sboth\sSQLITE_ENABLE_MULTITHREADED_CHECKS\sand\nSQLITE_ENABLE_API_ARMOUR\sare\sdefined.
+D 2017-12-05T14:58:59.468
 F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e5d7606238f55816da99f719969598df5b091aa2e9a6935c9412fcae8f53fc44
@@ -445,7 +445,7 @@ F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
 F src/memjournal.c 6f3d36a0a8f72f48f6c3c722f04301ac64f2515435fa42924293e46fc7994661
 F src/msvc.h 4942752b6a253116baaa8de75256c51a459a5e81
-F src/mutex.c 20172f2cc43c4542f7860ab6bafdd16965822c4e56650d62628059a48c7f43c4
+F src/mutex.c b021263554c8a3995e9d53193b8194b96d1ed28e06c3b532dd7f7d29cf0c7d53
 F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
 F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
 F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
@@ -1679,7 +1679,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 4c551fdebc7feda3dcfeec719387d879cd5e2cbe213c0c1aac0a965b3f9e882d
-R 16fbfec98373820063ea860cc1009c10
+P 5771b1d611b3562ea6c040f3f893073c4d0ee58c35b37ae211520d9aee8ed547
+R 926398ae5d668c18adb3c9f09b2dd707
 U dan
-Z b7aa606a2d2373a4fc095d067f4d9e36
+Z 60a10472a4a400f76cfacb5adca001dc

diff --git a/manifest.uuid b/manifest.uuid
index 01389c8854c415a5acf6e7e06664cba9f18445c2..3ccf62c2807205487c7465f451dba1ce48d99efa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5771b1d611b3562ea6c040f3f893073c4d0ee58c35b37ae211520d9aee8ed547
\ No newline at end of file
+0342ce510d2063a63839399a2cfa25b7fc02f4fde17764082676b332d6136241
\ No newline at end of file

diff --git a/src/mutex.c b/src/mutex.c
index 9e1bb65553d04c89afb491b582796ea9660c07b5..3699f91e38ccc97039aba8e4f3645bb43110adae 100644 (file)
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -134,7 +134,7 @@ static void checkMutexFree(sqlite3_mutex *p){
   assert( SQLITE_MUTEX_WARNONCONTENTION<2 );
 
 #if SQLITE_ENABLE_API_ARMOR
-  if( p->iType<2 ){
+  if( ((CheckMutex*)p)->iType<2 )
 #endif
   {
     CheckMutex *pCheck = (CheckMutex*)p;