From: mistachkin <mistachkin@noemail.net>
Date: Mon, 1 Sep 2014 19:29:19 +0000 (+0000)
Subject: For sqlite3_win32_is_nt(), assume WinRT is NT-based and revise #ifdef ordering to... 
X-Git-Tag: version-3.8.7~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=832436d145f70f43c179c8a8d813b2824c3b8ba9;p=thirdparty%2Fsqlite.git

For sqlite3_win32_is_nt(), assume WinRT is NT-based and revise #ifdef ordering to prefer the ANSI version of GetVersionEx, when available.

FossilOrigin-Name: be0a037244762cc0f5ff4a6d7822902f862767bd
---

832436d145f70f43c179c8a8d813b2824c3b8ba9
diff --cc manifest
index 262cca2377,8d07b759fe..9b13d487a6
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Tweak\sthe\sdocumentation\sfor\sSQLITE_LIMIT_WORKER_THREADS.\s\sNo\schanges\sto\nexecutable\scode.
- D 2014-09-01T18:21:27.480
 -C Revise\s#ifdef\sordering\sto\sprefer\sthe\sANSI\sversion\sof\sGetVersionEx,\swhen\savailable.
 -D 2014-08-22T19:12:16.818
++C For\ssqlite3_win32_is_nt(),\sassume\sWinRT\sis\sNT-based\sand\srevise\s#ifdef\sordering\sto\sprefer\sthe\sANSI\sversion\sof\sGetVersionEx,\swhen\savailable.
++D 2014-09-01T19:29:19.886
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
@@@ -208,18 -208,18 +208,18 @@@ F src/os.c 1b147e4cf7cc39e618115c14a086
  F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c bd7df3094a60915c148517504c76df4fca24e542
 -F src/os_win.c b979aabc18857645ea3bdc7eaa38df1c5678fae0
 +F src/os_unix.c 8525ca79457c5b4673a5fda2774ee39fe155f40f
- F src/os_win.c 08ce5616a5755da9400931fb39146e4a97801a2a
++F src/os_win.c 2aa8aa7780d7cf03e912d2088ab2ec5c32f33dc5
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
 -F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
 +F src/pager.c 3e732d2bbdd8d8d95fed0c5ae7e718d73153c4c5
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
 -F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
 -F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
 -F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
 -F src/pragma.c d10ef67c4de79f78188b965b4b7988aff1d66f2e
 -F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
 -F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
 +F src/pcache.c 3b3791297e8977002e56b4a9b8916f2039abad9b
 +F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
 +F src/pcache1.c c5af6403a55178c9d1c09e4f77b0f9c88822762c
 +F src/pragma.c 14bcdb504128a476cce5bbc086d5226c5e46c225
 +F src/prepare.c 3842c1dfc0b053458e3adcf9f6efc48e03e3fe3d
 +F src/printf.c 00986c86ddfffefc2fd3c73667ff51b3b9709c74
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
@@@ -1193,7 -1188,7 +1193,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P b1c0f0bc1bd8a3477cd7a7ab510f0442ac88b517
- R e35acb2d59911a863984f6391f72c8a4
- U drh
- Z 81654d2ebb78f72eec51a460f9ce0ce5
 -P 2f59e71fbf31d2bd788d11197943b2ff3f4046e1
 -R 01ec23265c3130f55ace673019fe8500
++P 672e7387b1bda8d007da7de4244226577d7ab2dc 9fe0f0754c063c17fffa9d4814b7180397cf5226
++R d670693d3a9e7f5751de171ad69fa48b
+ U mistachkin
 -Z 9a72fd0590798f8454637a5afefb97ac
++Z f220ace468e0f2c0622bd628ba90e47a
diff --cc manifest.uuid
index 870f68e991,acdb35ace2..4ae70b9684
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 672e7387b1bda8d007da7de4244226577d7ab2dc
 -9fe0f0754c063c17fffa9d4814b7180397cf5226
++be0a037244762cc0f5ff4a6d7822902f862767bd