Fix the MSVC makefile so that it works with OTA. Fix a harmless compiler

warning in FTS3.

FossilOrigin-Name: c7b16645307d6e46c4153693d6806269de64955f

diff --git a/Makefile.msc b/Makefile.msc
index 65832c50334fb431fb2b9a76c2b27a7e589866d0..74fc89a8db65ff42131650cedd3a28a87b298ad3 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1001,7 +1001,9 @@ SRC4 = \
   $(TOP)\ext\icu\sqliteicu.h \
   $(TOP)\ext\icu\icu.c \
   $(TOP)\ext\rtree\rtree.h \
-  $(TOP)\ext\rtree\rtree.c
+  $(TOP)\ext\rtree\rtree.c \
+  $(TOP)\ext\ota\sqlite3ota.h \
+  $(TOP)\ext\ota\sqlite3ota.c
 
 
 # Generated source code files
@@ -1061,7 +1063,8 @@ TESTSRC = \
   $(TOP)\src\test_vfs.c \
   $(TOP)\src\test_wsd.c \
   $(TOP)\ext\fts3\fts3_term.c \
-  $(TOP)\ext\fts3\fts3_test.c
+  $(TOP)\ext\fts3\fts3_test.c \
+  $(TOP)\ext\ota\test_ota.c
 
 # Statically linked extensions
 #

diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c
index 646d7acd5685733a52fa18e41d88bd2413b15fe7..a018a2bcdfea83448427d4d1c6dcc4002704e71d 100644 (file)
--- a/ext/fts3/fts3_snippet.c
+++ b/ext/fts3/fts3_snippet.c
@@ -131,7 +131,7 @@ struct StrBuffer {
 static MatchinfoBuffer *fts3MIBufferNew(int nElem, const char *zMatchinfo){
   MatchinfoBuffer *pRet;
   int nByte = sizeof(u32) * (2*nElem + 2) + sizeof(MatchinfoBuffer);
-  int nStr = strlen(zMatchinfo);
+  int nStr = (int)strlen(zMatchinfo);
 
   pRet = sqlite3_malloc(nByte + nStr+1);
   if( pRet ){

diff --git a/manifest b/manifest
index af61509d5cb5c1eb1beec71dd1cfd4a2635aa877..b7c9b4f43e7856d1bcee133bf25d8bcb3a07d7bb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Allow\sR-Tree\sgeometry\sfunctions\sto\stake\s8-byte\sBLOB\sarguments\swhich\sare\npassed\sdirectly\sthrough\sto\sthe\sunderlying\scallback,\sand\swhich\scan\sbe\sused\nto\spass\spointers\sinto\sthe\scallback.
-D 2015-05-19T22:20:48.133
+C Fix\sthe\sMSVC\smakefile\sso\sthat\sit\sworks\swith\sOTA.\s\sFix\sa\sharmless\scompiler\nwarning\sin\sFTS3.
+D 2015-05-19T22:56:45.390
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc f9da80e91c8f953f7517c979a1540ef8af1b386f
+F Makefile.msc 55fdbee85598e2c61fc1e643d02f38f1f943463c
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md 0bfccb18927349653c09137a458b961fa8ab4cb9
 F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@ -87,7 +87,7 @@ F ext/fts3/fts3_hash.c 29b986e43f4e9dd40110eafa377dc0d63c422c60
 F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf
 F ext/fts3/fts3_icu.c e319e108661147bcca8dd511cd562f33a1ba81b5
 F ext/fts3/fts3_porter.c 3565faf04b626cddf85f03825e86056a4562c009
-F ext/fts3/fts3_snippet.c b7aaa8698096b26e1c6eb563e317409323398142
+F ext/fts3/fts3_snippet.c 97a16ea233106b83b84a7a1e821318ea333688f7
 F ext/fts3/fts3_term.c 88c55a6fa1a51ab494e33dced0401a6c28791fd7
 F ext/fts3/fts3_test.c 8a3a78c4458b2d7c631fcf4b152a5cd656fa7038
 F ext/fts3/fts3_tokenize_vtab.c a27593ab19657166f6fa5ec073b678cc29a75860
@@ -1278,7 +1278,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 f5d0ce80792d58ef424300f973f8876d835ed4ad
-R 5846851b430040d78bdb1e84f57132a2
+P b271ed56532a78323accc8a7cb348d55f95c350e
+R 90be3dacb0448d45e67c9b3d977b8761
 U drh
-Z 13e366e41ee3fd8fbadbd262c604767f
+Z 153c06778c9f21378fccc520e3f4d229

diff --git a/manifest.uuid b/manifest.uuid
index 13bb89e9f059ece1d37da2a05941f026a5100b92..35751a8d8867f3a6c754a36b05ae086b7311ca96 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b271ed56532a78323accc8a7cb348d55f95c350e
\ No newline at end of file
+c7b16645307d6e46c4153693d6806269de64955f
\ No newline at end of file