Fix compilation issue in the Win32 VFS when manually defining SQLITE_WIN32_NO_ANSI.

FossilOrigin-Name: 6715991296886c2a02b9a285a1e61189ad1f79c0

diff --git a/manifest b/manifest
index 04ef69ea7d1d15bc65dea076a198c062a5b2719b..353ccbf28dbefcd94a2526ee61bf3b7819fdc9f8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sthe\scomments\sassociated\swith\sSQLITE_TEST_REALLOC_STRESS\sand\sadd\nan\sextra\sassert()\sto\sprove\san\sassumption.
-D 2014-08-12T14:29:20.012
+C Fix\scompilation\sissue\sin\sthe\sWin32\sVFS\swhen\smanually\sdefining\sSQLITE_WIN32_NO_ANSI.
+D 2014-08-12T16:13:37.205
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -208,7 +208,7 @@ F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c 119f4f1fb94e74373d53e4946d33e4bc31e91b26
-F src/os_win.c e0260a7ba735b4a30b5eccf1a3ace9d6b9718204
+F src/os_win.c 1c936c7b0659d0eb12b868e2cd710a570e78873e
 F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
 F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@ -1186,7 +1186,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a1baf3a7b177728cdfcd6d9345a0d6bf0a8887c0
-R f180a595651acb4f056167092db3a8a0
-U drh
-Z 0f6249f5f46f843c4c724ed2717337d8
+P 35c454616321d480ecbc4efdf6869bbcdf0d3aa2
+R b496e5fc455ad86aa746ec5d2b99190f
+U mistachkin
+Z fae056f6598b8171729329dfe1ec3668

diff --git a/manifest.uuid b/manifest.uuid
index 767223913433e5466019d260e4d2625ade558ad4..47dd9e4073ed7fb62485bec05bb389da8157f64f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-35c454616321d480ecbc4efdf6869bbcdf0d3aa2
\ No newline at end of file
+6715991296886c2a02b9a285a1e61189ad1f79c0
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 7d98490ab3a186146e3c1a4a13768234f6b7fed7..f479de3a1b62cd1eda07000ebeede3688d7c405b 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1324,13 +1324,15 @@ int sqlite3_win32_is_nt(void){
     OSVERSIONINFOW sInfo;
     sInfo.dwOSVersionInfoSize = sizeof(sInfo);
     osGetVersionExW(&sInfo);
+    osInterlockedCompareExchange(&sqlite3_os_type,
+        (sInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) ? 2 : 1, 0);
 #elif defined(SQLITE_WIN32_HAS_ANSI)
     OSVERSIONINFOA sInfo;
     sInfo.dwOSVersionInfoSize = sizeof(sInfo);
     osGetVersionExA(&sInfo);
-#endif
     osInterlockedCompareExchange(&sqlite3_os_type,
         (sInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) ? 2 : 1, 0);
+#endif
   }
   return osInterlockedCompareExchange(&sqlite3_os_type, 2, 2)==2;
 #elif SQLITE_TEST