From: mistachkin <mistachkin@noemail.net>
Date: Wed, 18 Jan 2017 23:12:27 +0000 (+0000)
Subject: For Windows 8.x and higher, require the SQLITE_WIN32_WIN8_SECTOR_SIZE compile-time... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2FwinSectorSize;p=thirdparty%2Fsqlite.git

For Windows 8.x and higher, require the SQLITE_WIN32_WIN8_SECTOR_SIZE compile-time option in order to enable sector size determination.

FossilOrigin-Name: 47beb55c5bf3baa7a430c2f9bbd7ba9c19346d91
---

diff --git a/manifest b/manifest
index d96d4ecb51..df5c274def 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sand\supdate\scomments.
-D 2017-01-18T19:36:10.754
+C For\sWindows\s8.x\sand\shigher,\srequire\sthe\sSQLITE_WIN32_WIN8_SECTOR_SIZE\scompile-time\soption\sin\sorder\sto\senable\ssector\ssize\sdetermination.
+D 2017-01-18T23:12:27.503
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -374,7 +374,7 @@ F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
-F src/os_win.c 2bd4caede7d9a916cc0a9be789f243a3c1ca6089
+F src/os_win.c 54fd6ea6a9e609174004d6fcddddd2bdc4ac486a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 9dc72d23eebbdf992bd69f2ab954d0d3a27c7340
 F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
@@ -1545,7 +1545,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 8d429a59cdad1693827b41369d642f9486c01155
-R 1d38fe74ce1d10707d97f6b91c77c8e9
+P 2dc16d345bfb492b2ec69463b6130ff1b62fd291
+R 583653aaf51043f6394c35e95117e229
 U mistachkin
-Z 19b1a1c98e5fbae99d5447129e998ccf
+Z f36279a74c520ca73c83f5f24da3d4a6
diff --git a/manifest.uuid b/manifest.uuid
index 2844a84d59..3d4326b3a6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2dc16d345bfb492b2ec69463b6130ff1b62fd291
\ No newline at end of file
+47beb55c5bf3baa7a430c2f9bbd7ba9c19346d91
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 63ace4300d..fa96944b26 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1028,8 +1028,8 @@ static struct win_syscall {
 #define osSetFilePointerEx ((BOOL(WINAPI*)(HANDLE,LARGE_INTEGER, \
         PLARGE_INTEGER,DWORD))aSyscall[65].pCurrent)
 
-#if SQLITE_OS_WINRT || (defined(_WIN32_WINNT) && \
-        _WIN32_WINNT >= _WIN32_WINNT_WIN8)
+#if SQLITE_OS_WINRT || (defined(SQLITE_WIN32_WIN8_SECTOR_SIZE) && \
+        defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN8)
   { "GetFileInformationByHandleEx", (SYSCALL)GetFileInformationByHandleEx, 0 },
 #else
   { "GetFileInformationByHandleEx", (SYSCALL)0,                  0 },
@@ -3684,7 +3684,8 @@ static BOOL winIsOnSameVolume(winFile *pFile){
 ** same for both.
 */
 static int winSectorSize(sqlite3_file *id){
-#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN8
+#if defined(SQLITE_WIN32_WIN8_SECTOR_SIZE) && \
+    defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN8
   if( osIsWin8Plus() ){
     winFile *pFile = (winFile*)id;
     FILE_STORAGE_INFO info;