From: drh <> Date: Tue, 15 Jun 2021 20:07:16 +0000 (+0000) Subject: Fix an incorrect ifdef in the previous check-in. X-Git-Tag: version-3.36.0~8^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fifdef-update;p=thirdparty%2Fsqlite.git Fix an incorrect ifdef in the previous check-in. FossilOrigin-Name: 4b2bb46730393292364b2be7db4e73fc8f93cd5a141aaf04f20fe0119deb5ab3 --- diff --git a/manifest b/manifest index 68cb958313..c5c9465312 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -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 +C Fix\san\sincorrect\sifdef\sin\sthe\sprevious\scheck-in. +D 2021-06-15T20:07:16.590 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 40e10111109abc39a50796ebab08f84df0b0730a5337d533639f78523191acc1 +F src/main.c 9c06f8dc6137aaa990692ce30db1c00c3e6a574c5a4756640625c19b507c65ec F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de @@ -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 603b851d7d923d71543760b09a55d72dbbc185ac9c353c954c331c0454992c80 -R 8654acc49485f5126a64e78b631149d4 +P d8cf407046f20b0398f19acd0dab6acb6c742911e21e1003cb5b194dd668d98e +R c793a2b6fd573c5020d76ea917fab815 U drh -Z beca0a8a4d2554cf61d23d5fded72e0d +Z dfa163831b09887fabddf76674335ea6 diff --git a/manifest.uuid b/manifest.uuid index 47bbf078a5..b1e83968fb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d8cf407046f20b0398f19acd0dab6acb6c742911e21e1003cb5b194dd668d98e \ No newline at end of file +4b2bb46730393292364b2be7db4e73fc8f93cd5a141aaf04f20fe0119deb5ab3 \ No newline at end of file diff --git a/src/main.c b/src/main.c index 9a8939382d..a04a6bc0f2 100644 --- a/src/main.c +++ b/src/main.c @@ -4284,7 +4284,7 @@ int sqlite3_test_control(int op, ...){ break; } -#if !defined(SQLITE_DEBUG) && !defined(SQLITE_OMIT_WSD) +#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