From: mistachkin <mistachkin@noemail.net>
Date: Sat, 7 Oct 2017 23:31:33 +0000 (+0000)
Subject: Fix C99-style variable declaration issue seen with older versions of MSVC.
X-Git-Tag: version-3.21.0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b60424e495ab486565fecc11a88863dd5a38c915;p=thirdparty%2Fsqlite.git

Fix C99-style variable declaration issue seen with older versions of MSVC.

FossilOrigin-Name: 14b181e862bd742555c51b87fab59d6f8f6602fe2c18dde3ef3b020779912419
---

diff --git a/manifest b/manifest
index 9ed6440a70..98e6126f23 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sfor\sthe\sexample\sfts3\s"rank"\sfunction\sthat\sappears\sin\sthe\ndocumentation.
-D 2017-10-06T18:00:36.541
+C Fix\sC99-style\svariable\sdeclaration\sissue\sseen\swith\solder\sversions\sof\sMSVC.
+D 2017-10-07T23:31:33.678
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -530,7 +530,7 @@ F src/vdbe.c 176c0897af0aedecd3abc9afaf7fa80eaa7cf5eaf62583de256a9961df474373
 F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97
 F src/vdbeInt.h 1fe00770144c12c4913128f35262d11527ef3284561baaab59b947a41c08d0d9
 F src/vdbeapi.c 9c670ca0dcc1cd86373aa353b747b26fe531ca5cd4331690c611d1f03842e2a1
-F src/vdbeaux.c 831a77aaa7aa43005f1c9bf3e9eb6506f4865e1cf99943ccdcd3be5d2dd8a3c7
+F src/vdbeaux.c 15368cf8463c31ecf49de4ccf82b8d41848715edc02298a8f9f61a54c8352d03
 F src/vdbeblob.c 635a79b60340a6a14a622ea8dcb081f0a66b1ac3836870c587f232eec08c0286
 F src/vdbemem.c 5c1533bf756918b4e46b2ed2bb82c29c7c651e1e37bbd0a0d8731a68787598ff
 F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
@@ -1656,7 +1656,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8ca0fa8dfe6a66aea7fc63f15e6f704cb190aa0760a3fec2db5f6bad3861a135
-R 413648e1416f08d1828bb75a07c656dd
-U dan
-Z b857c7dffd71ebfaddd17b63d1fd16c3
+P 702b137aa4f76543647e177beeb1ca2b3cd18c61021c78880e9aa8656f341d65
+R b0502fb9406ba19f89441a8efa35216f
+U mistachkin
+Z 1e54f1aa1bf639c462d6cc376839202e
diff --git a/manifest.uuid b/manifest.uuid
index b8a9eb4154..499518f380 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-702b137aa4f76543647e177beeb1ca2b3cd18c61021c78880e9aa8656f341d65
\ No newline at end of file
+14b181e862bd742555c51b87fab59d6f8f6602fe2c18dde3ef3b020779912419
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 9046922c39..88b38f77bd 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2868,6 +2868,10 @@ static void vdbeInvokeSqllog(Vdbe *v){
 ** VDBE_MAGIC_INIT.
 */
 int sqlite3VdbeReset(Vdbe *p){
+#ifdef SQLITE_DEBUG
+  int i;
+#endif
+
   sqlite3 *db;
   db = p->db;
 
@@ -2899,7 +2903,6 @@ int sqlite3VdbeReset(Vdbe *p){
 #ifdef SQLITE_DEBUG
   /* Execute assert() statements to ensure that the Vdbe.apCsr[] and 
   ** Vdbe.aMem[] arrays have already been cleaned up.  */
-  int i;
   if( p->apCsr ) for(i=0; i<p->nCursor; i++) assert( p->apCsr[i]==0 );
   if( p->aMem ){
     for(i=0; i<p->nMem; i++) assert( p->aMem[i].flags==MEM_Undefined );