Clarify the comment explaining the meaning of the SQLITE_WIN32_GETVERSIONEX

macro in the Windows VFS.

FossilOrigin-Name: 69714287dbbdbf4ef2a2c5e99ed740ae7d27e051

diff --git a/manifest b/manifest
index 8aa852cdf53b09e02319b92b9bb426b9221ac7ef..ab513ec9193a4fbbdfdff62bf152fba6dc3f952f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\s#ifdef\sissue\swith\sGetVersionEx\sin\sthe\sWin32\sVFS.
-D 2014-08-11T17:38:38.381
+C Clarify\sthe\scomment\sexplaining\sthe\smeaning\sof\sthe\sSQLITE_WIN32_GETVERSIONEX\nmacro\sin\sthe\sWindows\sVFS.
+D 2014-08-11T17:40:30.234
 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 17e7ab0f9160a78c964d615b15b1658ab2090d42
-F src/os_win.c d37c3e70e85f9c9bfb2e0dad1b1d8714077fbf8d
+F src/os_win.c f8affe82a8b28990879a564c84d78c51aab4fa90
 F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
 F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@ -1185,7 +1185,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 b5652439d5d770f0edeb80c8f55fa7cc515482e3
-R da55da95544cc788a74ff6acfb8e9051
-U mistachkin
-Z 276e7597dfac53b7c7af380d74f891b3
+P 1a0d466dd48163c86de4774035fe4a30c1c55311
+R 1a63d8cf8de05d642fa8f087d8e134e9
+U drh
+Z 62728ef38d819e244d119f9b4cea00bc

diff --git a/manifest.uuid b/manifest.uuid
index 2da18ac2ada98be5177737c354315219ea897e2b..c5ea92e575c0b411741ae1c90784d07a8f027911 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a0d466dd48163c86de4774035fe4a30c1c55311
\ No newline at end of file
+69714287dbbdbf4ef2a2c5e99ed740ae7d27e051
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 0f391f9521f2f578910db4ab18d7b5737ce7efd4..0ad87006bfdf836e6b8d7041b7df9c4b5c113fe4 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -72,18 +72,14 @@
 #endif
 
 /*
-** Check if the GetVersionEx[AW] functions should be considered deprecated
-** and avoid using them in that case.  It should be noted here that if the
-** value of the SQLITE_WIN32_GETVERSIONEX pre-processor macro is zero
-** (whether via this block or via being manually specified), that implies
-** the underlying operating system will always be based on the Windows NT
-** Kernel.
+** Check to see if the GetVersionEx[AW] functions are deprecated on the
+** target.  GetVersionEx[AW] were first deprecated in Win8.1.  The
 */
 #ifndef SQLITE_WIN32_GETVERSIONEX
 #  if defined(NTDDI_VERSION) && NTDDI_VERSION >= NTDDI_WINBLUE
-#    define SQLITE_WIN32_GETVERSIONEX   0
+#    define SQLITE_WIN32_GETVERSIONEX   0   /* GetVersionEx() is deprecated */
 #  else
-#    define SQLITE_WIN32_GETVERSIONEX   1
+#    define SQLITE_WIN32_GETVERSIONEX   1   /* GetVersionEx() is current */
 #  endif
 #endif