From: mistachkin <mistachkin@noemail.net>
Date: Tue, 20 Jul 2021 00:18:22 +0000 (+0000)
Subject: Fix compilation of 'threadtest3' for some older versions of MSVC.
X-Git-Tag: version-3.37.0~324
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5b70d06eac76742b052864d25d59caa3d64ce7d;p=thirdparty%2Fsqlite.git

Fix compilation of 'threadtest3' for some older versions of MSVC.

FossilOrigin-Name: b5ede6a68891820bd5b6d051b1b641bc1cd49104cad2466db184134d14f58f5b
---

diff --git a/Makefile.msc b/Makefile.msc
index 57ddbe7854..6a7f2a3a75 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2586,16 +2586,16 @@ rbu.exe:	$(TOP)\ext\rbu\rbu.c $(TOP)\ext\rbu\sqlite3rbu.c $(SQLITE3C) $(SQLITE3H
 	$(LTLINK) $(NO_WARN) -DSQLITE_ENABLE_RBU \
 		$(TOP)\ext\rbu\rbu.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
 
+THREADTEST3_SRC = \
+  $(TOP)\test\threadtest3.c \
+  $(TOP)\test\tt3_checkpoint.c \
+  $(TOP)\test\tt3_index.c \
+  $(TOP)\test\tt3_vacuum.c \
+  $(TOP)\test\tt3_stress.c \
+  $(TOP)\test\tt3_lookaside1.c
 
-THREADTEST3_SRC = $(TOP)\test\threadtest3.c    \
-                  $(TOP)\test\tt3_checkpoint.c \
-                  $(TOP)\test\tt3_index.c      \
-                  $(TOP)\test\tt3_vacuum.c      \
-                  $(TOP)\test\tt3_stress.c      \
-                  $(TOP)\test\tt3_lookaside1.c
-
-threadtest3.exe: sqlite3.obj $(THREADTEST3_SRC) $(TOP)/src/test_multiplex.c
-	$(LTLINK) $(TOP)\test\threadtest3.c $(TOP)\src\test_multiplex.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
+threadtest3.exe: $(THREADTEST3_SRC) $(TOP)\src\test_multiplex.c $(SQLITE3C) $(SQLITE3H)
+	$(LTLINK) $(NO_WARN) $(TOP)\test\threadtest3.c $(TOP)\src\test_multiplex.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
 
 LSMDIR=$(TOP)\ext\lsm1
 !INCLUDE $(LSMDIR)\Makefile.msc
@@ -2634,7 +2634,7 @@ clean:
 	del /Q sqlite-*-output.vsix 2>NUL
 	del /Q fuzzershell.exe fuzzcheck.exe sqldiff.exe dbhash.exe 2>NUL
 	del /Q sqltclsh.* 2>NUL
-	del /Q dbfuzz.exe sessionfuzz.exe 2>NUL
+	del /Q dbfuzz.exe sessionfuzz.exe threadtest3.exe 2>NUL
 	del /Q kvtest.exe ossshell.exe scrub.exe 2>NUL
 	del /Q showshm.exe sqlite3_checker.* sqlite3_expert.exe 2>NUL
 	del /Q fts5.* fts5parse.* 2>NUL
diff --git a/manifest b/manifest
index 7bb2b8c7ad..7a8f5db481 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C More\sprecision\sin\scomparing\sintegers\sand\sfloating\spoint\svalues\swhile\nprocessing\sthe\sinteger\sprimary\skey\sfor\sOP_SeekGE\sand\ssimilar.\n[forum:/forumpost/2bdb86a068|Forum\spost\s2bdb86a068].
-D 2021-07-19T20:52:31.773
+C Fix\scompilation\sof\s'threadtest3'\sfor\ssome\solder\sversions\sof\sMSVC.
+D 2021-07-20T00:18:22.983
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 83c348515cb62f6f2a2ddf3fd014113ff20564b776e1a614079722c88c6ff43d
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc be23161cf225f0574c34b866ade20824bef4e5473e924e0941fe954ccb253286
+F Makefile.msc 7dc32ba195639311ef4fa3d8f8ec218de37fde12d7ef5a33e9a7de921b0025ca
 F README.md 27fb76aa7eb57ed63a53bbba7292b6bf71f51125554f79f16b5d040edd1e6110
 F VERSION c6595fef606851f2bc3ebed6a7386c73751835fc909feab7c093739fa4b3c1d1
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1465,7 +1465,7 @@ F test/thread2.test f35d2106452b77523b3a2b7d1dcde2e5ee8f9e46
 F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c a70a8e94bef23339d34226eb9521015ef99f4df8
-F test/threadtest3.c fee869dba633f8403a7eef03bb038a3fc45f0814b9f829ea79a914fcc11f0218
+F test/threadtest3.c 655bff6c0895ec03f014126aa65e808fac9aae8c5a7a7da58a510cbe8b43b781
 F test/threadtest4.c c1e67136ceb6c7ec8184e56ac61db28f96bd2925
 F test/threadtest5.c 9b4d782c58d8915d7e955ff8051f3d03628bda0d33b82971ea8c0f2f2808c421
 F test/time-wordcount.sh 8e0b0f8109367827ad5d58f5cc849705731e4b90
@@ -1644,7 +1644,7 @@ F test/tt3_index.c 39eec10a35f57672225be4d182862152896dee4a
 F test/tt3_lookaside1.c 0377e202c3c2a50d688cb65ba203afeda6fafeb9
 F test/tt3_shared.c b37d22defc944a2ac4c91c927fd06c1d48cd51e2ce9d004fe868625bd2399f93
 F test/tt3_stress.c f9a769ca8b026ecc76ee93ca8c9700a5619f8e51c581107c4053ba6ac97f616f
-F test/tt3_vacuum.c 1753f45917699c9c1f66b64c717a717c9379f776
+F test/tt3_vacuum.c 71b254cde1fc49d6c8c44efd54f4668f3e57d7b3a8f4601ade069f75a999ba39
 F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
 F test/types2.test 1aeb81976841a91eef292723649b5c4fe3bc3cac
 F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
@@ -1920,7 +1920,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 4ce585fb07274284e3add6adcb66ed06e4b109584704d1ec7152bf43ca8d5d85
-R 000488406edbffc8806e75458a922494
-U drh
-Z 26015d8f2da64898ae34fc3a47735d30
+P f9c6426de3b413ff8fcf04a00931ca5f123f996c572b35181af114afa8d811d7
+R 4a4b4d7f4609ee7ad98f970aafca21aa
+U mistachkin
+Z d79e981ec4950b9bac6d5abcb02f1221
diff --git a/manifest.uuid b/manifest.uuid
index bfd7a78e8b..7fc59ca525 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f9c6426de3b413ff8fcf04a00931ca5f123f996c572b35181af114afa8d811d7
\ No newline at end of file
+b5ede6a68891820bd5b6d051b1b641bc1cd49104cad2466db184134d14f58f5b
\ No newline at end of file
diff --git a/test/threadtest3.c b/test/threadtest3.c
index f427324a23..3a12c5889b 100644
--- a/test/threadtest3.c
+++ b/test/threadtest3.c
@@ -830,7 +830,9 @@ static void join_all_threads_x(
   Thread *p;
   Thread *pNext;
   for(p=pThreads->pThread; p; p=pNext){
+#ifndef _WIN32
     void *ret;
+#endif
     int rc;
     pNext = p->pNext;
 
diff --git a/test/tt3_vacuum.c b/test/tt3_vacuum.c
index 023fdfd74d..c41a6b487d 100644
--- a/test/tt3_vacuum.c
+++ b/test/tt3_vacuum.c
@@ -23,9 +23,9 @@
 static char *vacuum1_thread_writer(int iTid, void *pArg){
   Error err = {0};                /* Error code and message */
   Sqlite db = {0};                /* SQLite database connection */
-  opendb(&err, &db, "test.db", 0);
   i64 i = 0;
 
+  opendb(&err, &db, "test.db", 0);
   while( !timetostop(&err) ){
     i++;