From: drh <drh@noemail.net>
Date: Wed, 6 Aug 2014 12:00:08 +0000 (+0000)
Subject: Merge the second InterlockedCompareExchange() fix from trunk.
X-Git-Tag: version-3.13.0~148^2~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73472e38cec9f226bd94012492d0d202a3718091;p=thirdparty%2Fsqlite.git

Merge the second InterlockedCompareExchange() fix from trunk.

FossilOrigin-Name: 69018967f6e38521dd9b0fa9ce05c9b947635335
---

73472e38cec9f226bd94012492d0d202a3718091
diff --cc manifest
index 80a3330a4d,f2683e69ef..8ab42e0c9a
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
--C Fix\san\sobsolete\scomment\sin\sthe\sfunc.c\ssource\sfile.\s\sNo\schanges\sto\scode.
- D 2014-08-06T11:49:31.740
 -D 2014-08-06T11:58:40.249
++C Merge\sthe\ssecond\sInterlockedCompareExchange()\sfix\sfrom\strunk.
++D 2014-08-06T12:00:08.042
  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,8 +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 091aa5f1047f0ec984a69ab1f356c1960813b77b
- R f8322f66146340bee955eb1bc05e0bbb
 -P ab1a751e1304749bef5bc5c833f9abed8950f7d0
 -Q +7a145c9409e70b92946534eb44c2e205f7309897
 -R c5d9492d210d0878e8d4fad26b1bb9f1
++P 7a145c9409e70b92946534eb44c2e205f7309897 5c6bb57d90bad32785d6d9cdf110a825bbc5ec73
++R f7c4de536b9a92bc8dd6b703c04d01eb
  U drh
- Z 2907f648c6e2ceca10c49409542f13ae
 -Z c0ef6bc5c4f2711fca6f4933f6dbf08d
++Z cae7acdddd6dd26c0313d812b71090a2
diff --cc manifest.uuid
index 374a6b101e,89b8c4d9e9..5d0b8910d9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7a145c9409e70b92946534eb44c2e205f7309897
 -5c6bb57d90bad32785d6d9cdf110a825bbc5ec73
++69018967f6e38521dd9b0fa9ce05c9b947635335