From: mistachkin <mistachkin@noemail.net>
Date: Mon, 7 Oct 2013 21:49:16 +0000 (+0000)
Subject: Fix compilation issue with MSVC.
X-Git-Tag: version-3.8.1~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86f72f07216cb62a543d49e9186ea8d0aaf6a795;p=thirdparty%2Fsqlite.git

Fix compilation issue with MSVC.

FossilOrigin-Name: 36d64dc36f18c166b2c93c43579fa3bbb5cd545f
---

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 4018a316f0..192e329659 100644
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -3036,7 +3036,7 @@ static int fts3FilterMethod(
 ){
   int rc;
   char *zSql;                     /* SQL statement used to access %_content */
-  int eSearch;;
+  int eSearch;
   Fts3Table *p = (Fts3Table *)pCursor->pVtab;
   Fts3Cursor *pCsr = (Fts3Cursor *)pCursor;
 
diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 22dd797c49..794b6dcbf1 100644
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -4780,7 +4780,7 @@ static int fts3DoAutoincrmerge(
     if( rc ) return rc;
   }
   rc = fts3SqlStmt(p, SQL_REPLACE_STAT, &pStmt, 0);
-  if( rc ) return rc;;
+  if( rc ) return rc;
   sqlite3_bind_int(pStmt, 1, FTS_STAT_AUTOINCRMERGE);
   sqlite3_bind_int(pStmt, 2, p->bAutoincrmerge);
   sqlite3_step(pStmt);
diff --git a/manifest b/manifest
index f73f1c1ded..9df2430a3d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Restore\sthe\shexrekey\spragma\swhich\swas\saccidently\sdeleted\sduring\sthe\npragma\srefactoring.\s\sMake\ssure\sthe\shexkey\sand\shexrekey\spragmas\sdo\snot\noverflow\sbuffers\swith\sa\sover-length\skey.
-D 2013-10-07T00:36:01.510
+C Fix\scompilation\sissue\swith\sMSVC.
+D 2013-10-07T21:49:16.905
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -78,7 +78,7 @@ F ext/fts3/README.content fdc666a70d5257a64fee209f97cf89e0e6e32b51
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 6d277a3ff6b20ff815184395407c5a4bd7787f9c
+F ext/fts3/fts3.c 543cbd7322822ea5dbbe6c17fdecf830c51dcb1c
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h 8689f7cf85020e7f88d1e761eeac480c3b0ea7ad
 F ext/fts3/fts3_aux.c b02632f6dd0e375ce97870206d914ea6d8df5ccd
@@ -96,7 +96,7 @@ F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
 F ext/fts3/fts3_unicode.c 92391b4b4fb043564c6539ea9b8661e3bcba47b9
 F ext/fts3/fts3_unicode2.c 0113d3acf13429e6dc38e0647d1bc71211c31a4d
-F ext/fts3/fts3_write.c 851e65f413576055f2e86a63d45b7d67c829db56
+F ext/fts3/fts3_write.c 17817f0cb6c8555e1be5e073fbddf676c60f4ea9
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/fts3/tool/fts3view.c 6cfc5b67a5f0e09c0d698f9fd012c784bfaa9197
@@ -1121,7 +1121,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 2bb7f74bbd467b74581699d16b06758f9c9457dc
-R cb77936fe5ecaea76a165316bdd4333b
-U drh
-Z 43e1a965446b3e0121e18fe95479d9fc
+P 0aca31e1514b3df254c049b4251bcb199831681a
+R d3aa6a286a3048275a719f5e0f524038
+U mistachkin
+Z c61ccb89f30c9bc6ea7f451bc07fd5fb
diff --git a/manifest.uuid b/manifest.uuid
index 4aae2f1188..d3c79e8894 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0aca31e1514b3df254c049b4251bcb199831681a
\ No newline at end of file
+36d64dc36f18c166b2c93c43579fa3bbb5cd545f
\ No newline at end of file