From: mistachkin <mistachkin@noemail.net>
Date: Wed, 1 Feb 2017 22:59:29 +0000 (+0000)
Subject: Fix C99-style variable declaration issue seen with older versions of MSVC.
X-Git-Tag: version-3.17.0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fa517bf2a8dbc4e76464675a0e5ef5af776bfa3;p=thirdparty%2Fsqlite.git

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

FossilOrigin-Name: 54d285464a222c59327eb6c917c1cc0125a55a27
---

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index ac76c18485..fe89835972 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -450,20 +450,23 @@ static void readCoord(u8 *p, RtreeCoord *pCoord){
 #endif
 }
 static i64 readInt64(u8 *p){
-  testcase( ((((char*)p) - (char*)0)&7)!=0 );  /* not always 8-byte aligned */
 #if SQLITE_BYTEORDER==1234 && MSVC_VERSION>=1300
   u64 x;
+  testcase( ((((char*)p) - (char*)0)&7)!=0 );  /* not always 8-byte aligned */
   memcpy(&x, p, 8);
   return (i64)_byteswap_uint64(x);
 #elif SQLITE_BYTEORDER==1234 && (GCC_VERSION>=4003000 || CLANG_VERSION>=3000000)
   u64 x;
+  testcase( ((((char*)p) - (char*)0)&7)!=0 );  /* not always 8-byte aligned */
   memcpy(&x, p, 8);
   return (i64)__builtin_bswap64(x);
 #elif SQLITE_BYTEORDER==4321
   i64 x;
+  testcase( ((((char*)p) - (char*)0)&7)!=0 );  /* not always 8-byte aligned */
   memcpy(&x, p, 8);
   return x;
 #else
+  testcase( ((((char*)p) - (char*)0)&7)!=0 );  /* not always 8-byte aligned */
   return (
     (((i64)p[0]) << 56) + 
     (((i64)p[1]) << 48) + 
diff --git a/manifest b/manifest
index 2bea70b5b4..aa07fecd68 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\soption\sto\sthe\sMSVC\smakefile\sto\senable\streating\swarnings\sas\serrors.
-D 2017-02-01T22:32:49.021
+C Fix\sC99-style\svariable\sdeclaration\sissue\sseen\swith\solder\sversions\sof\sMSVC.
+D 2017-02-01T22:59:29.767
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
@@ -264,7 +264,7 @@ F ext/rbu/sqlite3rbu.c bb0de6cdbdb14a7d55a097238a434b7e99caf318
 F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
 F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c f2c8604fcdbe13f960c5f0b97acbc2a870b72bf2
+F ext/rtree/rtree.c 58d3fa51e270b93e1d4ceb7ffb5c0f3b85cb4129
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -1552,7 +1552,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 4854ea9c18e7d8066c90b41568d0fae97b01ea6d
-R edeb8ee1db3973795f07ac14a992bc66
+P 6a378c29b43d61313ca9daa599e59d8eeeed9a27
+R 464fa6ae427ab1455a9a5204291b6a50
 U mistachkin
-Z 3bfb007e12a85d09e541803b4d02a604
+Z 85455f002136d0ca47deec93d577c815
diff --git a/manifest.uuid b/manifest.uuid
index 72864f657b..93c65ce658 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a378c29b43d61313ca9daa599e59d8eeeed9a27
\ No newline at end of file
+54d285464a222c59327eb6c917c1cc0125a55a27
\ No newline at end of file