From: drh <drh@noemail.net>
Date: Wed, 6 Aug 2014 03:16:56 +0000 (+0000)
Subject: Merge in the fix for the InterlockedCompareExchange() build issue.
X-Git-Tag: version-3.13.0~148^2~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a3d6085adb3755af8127809f3c2ea514418eebb;p=thirdparty%2Fsqlite.git

Merge in the fix for the InterlockedCompareExchange() build issue.

FossilOrigin-Name: 091aa5f1047f0ec984a69ab1f356c1960813b77b
---

6a3d6085adb3755af8127809f3c2ea514418eebb
diff --cc manifest
index 125bfcd3c3,33c5c487e2..25d96a1c40
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\s3.8.6\sbeta\schanges\sfrom\strunk.
- D 2014-08-06T01:25:47.611
 -C In\sthe\sWin32\sVFS,\swork\saround\sInterlockedCompareExchange()\sbeing\sa\smacro\son\ssome\splatforms\s(e.g.\sx64).
 -D 2014-08-06T03:06:01.637
++C Merge\sin\sthe\sfix\sfor\sthe\sInterlockedCompareExchange()\sbuild\sissue.
++D 2014-08-06T03:16:56.688
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in 639859a6f81bd15921ccd56ddbd6dfd335278377
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc d389ce1d436d21a93a9f5f6211dc45e4b8860962
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -1200,7 -1185,7 +1200,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 43401ee624587ffa166c3cda7e5265ad0d81da5c 717245d48714c08156c9b7636aaa6c3a402bad66
- R dc185340dec02c23864326e2a38aabfb
 -P 717245d48714c08156c9b7636aaa6c3a402bad66
 -R c63f8cfa87b32fea35b14f1ae3f3b367
 -U mistachkin
 -Z 0f9f130c5300af8c7a887c050bb16bac
++P 68a6d5e2f43702c78057ae2f2a7345c981d24e17 7be244ce129d6502f3a3e3f3e8a1dd61ef71d878
++R 895a81415e1d620e3196223591337e06
 +U drh
- Z 89e6d570704a9eb31c76806cdd19debb
++Z 282de6283138a0396ca3a1a5b524cbe0
diff --cc manifest.uuid
index a60eb67cdd,87d1cc7902..96790e8187
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 68a6d5e2f43702c78057ae2f2a7345c981d24e17
 -7be244ce129d6502f3a3e3f3e8a1dd61ef71d878
++091aa5f1047f0ec984a69ab1f356c1960813b77b