From: dan <dan@noemail.net>
Date: Fri, 2 Feb 2018 16:28:19 +0000 (+0000)
Subject: Remove the "include <io.h>" win32 dependency from the zipfile extension.
X-Git-Tag: version-3.23.0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3944cf8de3073675c0bc30e136652db386584e0e;p=thirdparty%2Fsqlite.git

Remove the "include <io.h>" win32 dependency from the zipfile extension.

FossilOrigin-Name: cb3feb3bc33718625159eddbf8ef608cd641af84e97d433d6b11ba6da94dad2e
---

diff --git a/ext/misc/zipfile.c b/ext/misc/zipfile.c
index 6c3f2b2373..a94a8df3ce 100644
--- a/ext/misc/zipfile.c
+++ b/ext/misc/zipfile.c
@@ -30,10 +30,6 @@ SQLITE_EXTENSION_INIT1
 #include <string.h>
 #include <assert.h>
 
-#if defined(_WIN32) || defined(WIN32)
-#  include <io.h>
-#endif
-
 #include <zlib.h>
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
diff --git a/manifest b/manifest
index f4b964ef4f..2443207a1f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\stime()\sdependency\sfrom\sthe\szipfile\sextension.\sUse\sSQLite\sVFS\nmethods\sinstead.
-D 2018-02-02T16:20:41.841
+C Remove\sthe\s"include\s<io.h>"\swin32\sdependency\sfrom\sthe\szipfile\sextension.
+D 2018-02-02T16:28:19.035
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea
@@ -304,7 +304,7 @@ F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
 F ext/misc/vtablog.c 31d0d8f4406795679dcd3a67917c213d3a2a5fb3ea5de35f6e773491ed7e13c9
 F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
 F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
-F ext/misc/zipfile.c 8043b5efef0da4abba31ac021a9ea9aaf216c72547fb7f64eed9e08fd96107ff
+F ext/misc/zipfile.c 8aa0d3da5ccb360dbca578a95597bd4892ccc56b63f01447dcbb0e035720fb9f
 F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e
 F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842
 F ext/rbu/rbu10.test 1846519a438697f45e9dcb246908af81b551c29e1078d0304fae83f1fed7e9ee
@@ -1704,7 +1704,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 3f621545879ea39502cfaf2b61883f92c077070274b4fdf45524ded81cac3e63
-R 0244469f34b504c4ae85aff5c78a3c61
+P 0702fb5611c7cf0154c5490eeada66afc733731dff0fe030375bae6a72123a17
+R 343c0b60986622084d28e8dfa8a41cbf
+T +closed db32506880e727597e8629c21d29a4b5e3360bec7548d98ecdbb09685fd6e7a8
 U dan
-Z ce324d9598828c350892743fba0ec306
+Z 0fa1b90106adf879fb72d19e962c14d7
diff --git a/manifest.uuid b/manifest.uuid
index 70ec2da9e1..866db96ab5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0702fb5611c7cf0154c5490eeada66afc733731dff0fe030375bae6a72123a17
\ No newline at end of file
+cb3feb3bc33718625159eddbf8ef608cd641af84e97d433d6b11ba6da94dad2e
\ No newline at end of file