Make the 'fs' virtual table module portable to Windows.

FossilOrigin-Name: dd473cae5b6ea02b73168b30365f0af5556ee24d

diff --git a/Makefile.msc b/Makefile.msc
index 631e9edcbf607b9d45b457960a2a11acfa05075a..2fb9687655fed7cc9914b9966ecd4f47e39a7f02 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -678,6 +678,7 @@ TESTSRC = \
   $(TOP)\src\test_config.c \
   $(TOP)\src\test_demovfs.c \
   $(TOP)\src\test_devsym.c \
+  $(TOP)\src\test_fs.c \
   $(TOP)\src\test_func.c \
   $(TOP)\src\test_fuzzer.c \
   $(TOP)\src\test_hexio.c \

diff --git a/manifest b/manifest
index 45d665a46156fbc29c82a24e5da5a7d6684b44d5..6aa81d2aeb36d04ba9799e2dbe8c5d0e38bcfb71 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Fix\sthe\sactivate_extensions\spragma\sso\sthat\sit\sis\sa\sno-op\swhen\sthe\srequired\nargument\sis\somitted.
-D 2013-01-16T20:33:02.794
+C Make\sthe\s'fs'\svirtual\stable\smodule\sportable\sto\sWindows.
+D 2013-01-17T03:18:14.519
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 2b8371775ea8df029d1acf0c3d4c3782d3bd5711
+F Makefile.msc 1bed3bca025ee90441bb0c9f95f36f42b70bd839
 F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
@@ -200,7 +200,7 @@ F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
 F src/test_config.c 09781397ccc24268cb895be0d4c21b4aad651486
 F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
-F src/test_fs.c 7d3337933e92c198d06dd600375cc39259cc66b3
+F src/test_fs.c 1c51e203b2c20235d8c3739f8c1fb13a7502915b
 F src/test_func.c 3a8dd37c08ab43b76d38eea2836e34a3897bf170
 F src/test_fuzzer.c 1d26aa965120420bc14807da29d4d4541bfa6148
 F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
@@ -1033,7 +1033,10 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P d5ebb7877885839e93eee3b322624d4c4215c1c4
-R 7e1018eedcfc760a5a5a61f3eb36bf10
-U drh
-Z cc9e1bb14175b94a3737a5872056637d
+P 6195ebd83323eaad92a0aa095cce1094bf8e2ba6
+R 391d1ca86287065efd5d1c0418e3ba47
+T *branch * fsVfsWin
+T *sym-fsVfsWin *
+T -sym-trunk *
+U mistachkin
+Z 13b4bb0aa5332689b2ba5723b1c52e70

diff --git a/manifest.uuid b/manifest.uuid
index bcd1128fbe3ed0fa971e5b11a5325ff775d3698d..0134790b17f2a039c7a9fdd8e44107f514c367ae 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6195ebd83323eaad92a0aa095cce1094bf8e2ba6
\ No newline at end of file
+dd473cae5b6ea02b73168b30365f0af5556ee24d
\ No newline at end of file

diff --git a/src/test_fs.c b/src/test_fs.c
index 9678005c8df668c359909e14e9d22cae12686a3d..532f92528bb6540095bc5fc645339c5a80b2003d 100644 (file)
--- a/src/test_fs.c
+++ b/src/test_fs.c
@@ -37,9 +37,15 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 
+#if SQLITE_OS_UNIX
+# include <unistd.h>
+#endif
+#if SQLITE_OS_WIN
+# include <io.h>
+#endif
+
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 
 typedef struct fs_vtab fs_vtab;