Emcc seems confused by SQLITE_DEBUG, for reasons unknown. Use NDEBUG instead

to simplify the #ifdef logic in sqlite3recover.c.

FossilOrigin-Name: 2610779ac84ac4a1a6901b6244653faf0c49ac6f0a4710a19aaf2a13106ae742

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index f81ddf302ab9dd283079adb99a1761a56ebd52f3..1597d4abf7a16d7f310b6ad7f800a59c5cf5ee43 100644 (file)
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2010,13 +2010,11 @@ static void recoverFinalCleanup(sqlite3_recover *p){
   p->pGetPage = 0;
 
   {
-#ifdef SQLITE_DEBUG
+#ifndef NDEBUG
     int res = 
 #endif
        sqlite3_close(p->dbOut);
-#ifdef SQLITE_DEBUG
     assert( res==SQLITE_OK );
-#endif
   }
   p->dbOut = 0;
 }

diff --git a/manifest b/manifest
index 83294c85a571686915828b052a03f2f313afaa35..618b053ced227d5506f1599a2672d19d800681b8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\ssymbol\sname\stypo\swhich\sbroke\sand\sexception-handling\scase\sin\sOPFS\sxOpen().
-D 2022-11-02T08:49:05.552
+C Emcc\sseems\sconfused\sby\sSQLITE_DEBUG,\sfor\sreasons\sunknown.\s\sUse\sNDEBUG\sinstead\nto\ssimplify\sthe\s#ifdef\slogic\sin\ssqlite3recover.c.
+D 2022-11-02T11:25:33.199
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c bd0723710da404a85d9a4194d7b694e238118d3431df1b036c1090f3cb22c795
+F ext/recover/sqlite3recover.c 89488d58e45645f38eaf46d65c90434976da40b25304282f7a54858244d63d7e
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -2054,8 +2054,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 17cdcad627205cdc8ae8114df44ad2a44e59603200efb238fbbb5c30ea0a453e
-R b5852b88f4b76c009c5011f611c070bf
-U stephan
-Z 3a7fb0297f0bfd236153f29f2af79966
+P 5bc83d569594e104e90b1acef1a5fd23655b2089de393a6776e799fdef2082f5
+R 9c17a1415bba7769c29ae72a7a64647a
+U drh
+Z c15361b7db363b8dd30434361c36431b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 51bcea29bbcf1c3ad26a22b990aa2c55521b7102..14e359d1403e666a3b61a51913471a37f09e66e7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5bc83d569594e104e90b1acef1a5fd23655b2089de393a6776e799fdef2082f5
\ No newline at end of file
+2610779ac84ac4a1a6901b6244653faf0c49ac6f0a4710a19aaf2a13106ae742
\ No newline at end of file