Fix SQLITE_BYTEORDER #defines in R-Tree when compiled separately from the

amalgamation.

FossilOrigin-Name: a136609c98ed3cc673c5a3c2578d49db3f2518d1

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index e898e34b7907e42676ce47a588795d6c62e666b8..a28827251708c64d287b70db6894756d093449a7 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -408,13 +408,13 @@ struct RtreeMatchArg {
      defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
      defined(__arm__)) && !defined(SQLITE_RUNTIME_BYTEORDER)
 # define SQLITE_BYTEORDER    1234
-#endif
-#if (defined(sparc)    || defined(__ppc__))  \
+#elif (defined(sparc)    || defined(__ppc__))  \
     && !defined(SQLITE_RUNTIME_BYTEORDER)
 # define SQLITE_BYTEORDER    4321
-#endif
+#else
 # define SQLITE_BYTEORDER    0     /* 0 means "unknown at compile-time" */
 #endif
+#endif
 
 
 /* What version of MSVC is being used.  0 means MSVC is not being used */

diff --git a/manifest b/manifest
index 255e0df9089e99de4e114eb4fe1107742aa66200..1e7c95b5542e10579d416719bb2bf3be0dbaab4c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\scellMargin()\sroutine\sof\sR-Tree\sslightly\ssmaller\sand\sfaster\swhile\salso\nfixing\sa\sharmless\scompiler\swarning.
-D 2017-02-07T12:58:38.284
+C Fix\sSQLITE_BYTEORDER\s#defines\sin\sR-Tree\swhen\scompiled\sseparately\sfrom\sthe\namalgamation.
+D 2017-02-07T13:51:48.651
 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 773fbf1217a12607a5898eeb5193974b6d2bdad4
+F ext/rtree/rtree.c 97b6560be68c20d27169ec14b805609f3ca4d90f
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -1554,7 +1554,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 0611770d6a2fcb9fa0bedee19df9916820ae8f3b
-R b3ac1d676d5ca604a8be68bb866fbceb
+P 07fe6228208684d579c4f6c334c90eb6262a9233
+R fb7b4c31979a0a5dd9190e2f71115220
 U drh
-Z 3ad4f65e4d593a16597f73c400a250b4
+Z e9cc05bda60d84b045dd690e40ba6bd5

diff --git a/manifest.uuid b/manifest.uuid
index 865247349a2441b0176d2ebac0cde7d852d9964d..cbfdaf943432bba1f5b78efd814455f656d87450 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-07fe6228208684d579c4f6c334c90eb6262a9233
\ No newline at end of file
+a136609c98ed3cc673c5a3c2578d49db3f2518d1
\ No newline at end of file