Fix kvtest.c so that it compiles using MSVC.

FossilOrigin-Name: e2bbeae7e77cde531885ca492494a02e5322154d

diff --git a/manifest b/manifest
index 0ee7887b32df46c48aa6922b2778b1ea66fff6b5..600430855b590ac09675246a2da73afb2aa99c2b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\skvtest.c:\sdo\snot\sshow\sthe\s--cache-size\ssetting\son\sfopen()\sruns.\nShow\sprogress\sfor\sthe\s(potentially\sslow)\s"export"\scommand.
-D 2016-12-29T15:26:50.575
+C Fix\skvtest.c\sso\sthat\sit\scompiles\susing\sMSVC.
+D 2016-12-29T16:18:35.078
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -894,7 +894,7 @@ F test/json101.test c0897616f32d95431f37fd291cb78742181980ac
 F test/json102.test bf3fe7a706d30936a76a0f7a0375e1e8e73aff5a
 F test/json103.test c5f6b85e69de05f6b3195f9f9d5ce9cd179099a0
 F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
-F test/kvtest.c b25f9fbcb2c1479b8df949ac2ce77362aaf86626
+F test/kvtest.c ae8d6b7def067c9a2587c7407c51cc3bc3265994
 F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
 F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
 F test/like.test 0603f4fa0dad50987f70032c05800cbfa8985302
@@ -1540,7 +1540,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 f6fcac6ae8b3bffee6bf994eef2064affd301a95
-R b185b854ef51d14c2b7ee5552cbd21ed
+P b0f58d2470e08b9c217afd19fcfde3e6d1007d1d
+R 407e9e40cdfd5c1d4c79f070fab30b80
 U drh
-Z 874446abf963a27a56a6fa2b35a90f66
+Z e5c7d745e1b19fb63cf400140139de77

diff --git a/manifest.uuid b/manifest.uuid
index 1919d6c8cafdd6c33978eefd0dc83a0496c2741a..a51064f52d58c5b81b7cbd6a1dd234e0c0ffba0a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b0f58d2470e08b9c217afd19fcfde3e6d1007d1d
\ No newline at end of file
+e2bbeae7e77cde531885ca492494a02e5322154d
\ No newline at end of file

diff --git a/test/kvtest.c b/test/kvtest.c
index 8c6915f23845f675a95d74e7bfecd313146b81bf..bb23312a249663202e739c407ece2212e948e1a8 100644 (file)
--- a/test/kvtest.c
+++ b/test/kvtest.c
@@ -51,11 +51,21 @@ static const char zHelp[] =
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <assert.h>
 #include <string.h>
 #include "sqlite3.h"
 
+#ifndef _WIN32
+# include <unistd.h>
+#else
+  /* Provide Windows equivalent for the needed parts of unistd.h */
+# include <io.h>
+# define R_OK 2
+# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define access _access
+#endif
+
+
 /*
 ** Show thqe help text and quit.
 */