Fix some minor #ifdef issues so that all of the supported compile-time

options continue to build.

FossilOrigin-Name: d8cf407046f20b0398f19acd0dab6acb6c742911e21e1003cb5b194dd668d98e

diff --git a/manifest b/manifest
index 5c040d1cdba1fe251ec3f3b1b7f82d7422aeca0c..68cb958313a87969e3dabfe77503c7c6ff560837 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\s"nmakehlp.c"\sutility\sprogram\ssources\sassociated\swith\sthe\sTCL\nExtension\sArchitecture,\sobtained\sfrom\n[https://core.tcl-lang.org/sampleextension/file].\s\sPerhaps\sthis\snew\nversion\swill\ssit\sbetter\swith\ssalmonx's\sstatic\sanalyzer\n[forum:/forumpost/7f0beca9797ee23a|(ref1)],\n[forum:/forumpost/7d5c8b19231ad57f|(ref2)].
-D 2021-06-15T15:36:05.310
+C Fix\ssome\sminor\s#ifdef\sissues\sso\sthat\sall\sof\sthe\ssupported\scompile-time\noptions\scontinue\sto\sbuild.
+D 2021-06-15T18:46:06.931
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -508,7 +508,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 2189e0e596010a0dc5405d9f14f78db1ee2fa71138c931f5b6ea96610b95bfc1
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 12684b3f19cd103cea97cdf14d0758196d0c646e12a898d7245141a9abfde9a4
-F src/main.c 7a1b7017af16977b298ef5a0b824b1153f1c878f94885a098620c3c1b1078ce9
+F src/main.c 40e10111109abc39a50796ebab08f84df0b0730a5337d533639f78523191acc1
 F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -528,7 +528,7 @@ F src/os.c 59ed1f503347e8b5434c0ce7d7d0f02a3f24a72fea8b26d0bba2de8dfaef778b
 F src/os.h 26890f540b475598cd9881dcc68931377b8d429d3ea3e2eeb64470cde64199f8
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c efa60c1cb54dba767abbba3c6dd67d3df5ef8aa26e2e499c37f055f56a374068
+F src/os_unix.c feac74a0ba7652c405ba30f61d9e738be717d15899f2915a129ef160a3e5b26b
 F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 95c255256b13827caf038c8f963d334784073f38ab6ef9d70371d9d04f3c43e0
@@ -1918,7 +1918,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 272a15b9f418fb0b31a9808f7c42c20cf52318035ff98935d8e8519634357e8d
-R 097386e0f9bf33b02f625d198897ad8a
+P 603b851d7d923d71543760b09a55d72dbbc185ac9c353c954c331c0454992c80
+R 8654acc49485f5126a64e78b631149d4
 U drh
-Z 29173b5fde864001fb27d15e020c7b34
+Z beca0a8a4d2554cf61d23d5fded72e0d

diff --git a/manifest.uuid b/manifest.uuid
index 9402113a6f375d1d0712b013c40fbcbe9a63b222..47bbf078a539ed7b9b2328d184a8e0ac22eec54f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-603b851d7d923d71543760b09a55d72dbbc185ac9c353c954c331c0454992c80
\ No newline at end of file
+d8cf407046f20b0398f19acd0dab6acb6c742911e21e1003cb5b194dd668d98e
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 732c085a989607e88e185c3012f7fdd57f084483..9a8939382def0cbf5d2c702be970e908886dd17c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4284,7 +4284,7 @@ int sqlite3_test_control(int op, ...){
        break;
     }
 
-#ifdef SQLITE_DEBUG
+#if !defined(SQLITE_DEBUG) && !defined(SQLITE_OMIT_WSD)
     /* sqlite3_test_control(SQLITE_TESTCTRL_TUNE, id, *piValue)
     **
     ** If "id" is an integer between 1 and SQLITE_NTUNE then set the value

diff --git a/src/os_unix.c b/src/os_unix.c
index 750b3e170fcce0229f5d75c0c10496975e3aa351..d45fdabab24e4a9bae0dee8e5bef4bfd0e3c4169 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -8068,6 +8068,7 @@ int sqlite3_os_init(void){
   }
   unixBigLock = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_VFS1);
 
+#ifndef SQLITE_OMIT_WAL
   /* Validate lock assumptions */
   assert( SQLITE_SHM_NLOCK==8 );  /* Number of available locks */
   assert( UNIX_SHM_BASE==120  );  /* Start of locking area */
@@ -8083,6 +8084,8 @@ int sqlite3_os_init(void){
   **    DMS         UNIX_SHM_BASE+8    128
   */
   assert( UNIX_SHM_DMS==128   );  /* Byte offset of the deadman-switch */
+#endif
+
   return SQLITE_OK; 
 }