When building from the amalgamation with ENABLE_RTREE defined, do not try to include...

FossilOrigin-Name: 5b63e981f1bef26eae0da3144a08bdc54dc36709

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 8e2f8666bf7f03c961aa4b5c7b1205e46e0f66fc..444e23547f9f0e6c901a519f443f61390c7fa6b7 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -64,12 +64,11 @@
   #include "sqlite3.h"
 #endif
 
-#include "sqlite3rtree.h"
-
 #include <string.h>
 #include <assert.h>
 
 #ifndef SQLITE_AMALGAMATION
+#include "sqlite3rtree.h"
 typedef sqlite3_int64 i64;
 typedef unsigned char u8;
 typedef unsigned int u32;

diff --git a/manifest b/manifest
index 795957d3088808cab063e02928e6026c9b4045a0..c801c27bad8a0c6cbb0c2574ae25ef8aa631fdf3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C A\sfurther\scorrection\sto\sthe\ssqlite3_create_function()\sinterface\sdocumentation.
-D 2010-09-10T20:23:11
+C When\sbuilding\sfrom\sthe\samalgamation\swith\sENABLE_RTREE\sdefined,\sdo\snot\stry\sto\sinclude\ssqlite3rtree.h.
+D 2010-09-11T05:15:38
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -82,7 +79,7 @@ F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
 F ext/icu/icu.c 850e9a36567bbcce6bd85a4b68243cad8e3c2de2
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c e26735d586497dbd037b3a6b2df25f9e6ea5b0ec
+F ext/rtree/rtree.c a1a1202ac87be4e17969f1b26ac1bd26a804205f
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test dbd4250ac0ad367a262eb9676f7e3080b0368206
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -860,14 +857,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 3a051a76f7f116f9ba25fe4e41418b9f0c1401be
-R 134ffbcea83449c391b7b8407259d729
-U drh
-Z cc3125eccda8184ebd1b2aa0e8ffe8b1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMipOxoxKgR168RlERAqnbAJ9Sqka4Oe3CCZ4AUbp/seZphAk3gQCePFq/
-EHvnJqakKv0+dklQBIvbQ34=
-=cAEO
------END PGP SIGNATURE-----
+P c65583dbc7203132010d223cce205f007a50c9ee
+R 6d86dfe87f6f388a64cf2ae7ca4571d4
+U dan
+Z 085aaafc3fe0100f3118b285035f1c7a

diff --git a/manifest.uuid b/manifest.uuid
index da76696e4f640a50e22354e6aab71da952e2b870..2ad3181607765c31e6e7464e5a0031dd5e42642f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c65583dbc7203132010d223cce205f007a50c9ee
\ No newline at end of file
+5b63e981f1bef26eae0da3144a08bdc54dc36709
\ No newline at end of file