From: mistachkin <mistachkin@noemail.net>
Date: Fri, 26 Jun 2015 17:10:12 +0000 (+0000)
Subject: Merge changes to get FTS5 working with MSVC.
X-Git-Tag: version-3.8.11~114^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec6c0c6e6f7f728db7942bebaa179dbde64a9c6e;p=thirdparty%2Fsqlite.git

Merge changes to get FTS5 working with MSVC.

FossilOrigin-Name: 954231d29d60460d423ecb132bbfb725b0ea375a
---

ec6c0c6e6f7f728db7942bebaa179dbde64a9c6e
diff --cc manifest
index 6b53ebf4a5,c83e275003..77f03ee837
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sfts5\sinitialization\scode\sfrom\score\sfile\smain.c.
- D 2015-06-26T16:42:17.368
 -C Merge\supstream\schanges.\s\sGet\sthe\stest\sfixture\sworking\swith\sFTS5.\s\sFix\scompiler\swarnings.
 -D 2015-06-26T16:55:55.630
++C Merge\schanges\sto\sget\sFTS5\sworking\swith\sMSVC.
++D 2015-06-26T17:10:12.989
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1364,7 -1364,7 +1364,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 3175220747f5d4dadd17e09fb1899dc782c90926
- R 91fd07ffaf7094308b4ec5a4e0e61dc1
- U dan
- Z ca6474591f774c998709d70d57deb075
 -P be85b82499f63dce4378f29adf8366651e965325 c91a93b343b4d3b1a19afdb5d23d1c508f9779d2
++P c91a93b343b4d3b1a19afdb5d23d1c508f9779d2 bfcd16089cf8c65130c011a9718bf7812685c841
+ R 297861c6724b6a9194bdf2ab25858763
++T +closed bfcd16089cf8c65130c011a9718bf7812685c841
+ U mistachkin
 -Z 93e72613bfe7ab9055e0a552e03ca93f
++Z d2f82b98bab3ebc4b4555fb7502228b7
diff --cc manifest.uuid
index 35291f1b95,79375d4063..8cd37282a3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c91a93b343b4d3b1a19afdb5d23d1c508f9779d2
 -bfcd16089cf8c65130c011a9718bf7812685c841
++954231d29d60460d423ecb132bbfb725b0ea375a