/ Check-in [5b63e981]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:When building from the amalgamation with ENABLE_RTREE defined, do not try to include sqlite3rtree.h.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 5b63e981f1bef26eae0da3144a08bdc54dc36709
User & Date: dan 2010-09-11 05:15:38
Context
2010-09-11
15:54
Add assert() statements to demonstrate that memory allocations are always aligned to an 8-byte boundary (unless SQLITE_4_BYTE_ALIGNED_MALLOC is defined). check-in: 305cc4e6 user: drh tags: trunk
05:15
When building from the amalgamation with ENABLE_RTREE defined, do not try to include sqlite3rtree.h. check-in: 5b63e981 user: dan tags: trunk
2010-09-10
20:23
A further correction to the sqlite3_create_function() interface documentation. check-in: c65583db user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/rtree/rtree.c.

    60     60   #ifndef SQLITE_CORE
    61     61     #include "sqlite3ext.h"
    62     62     SQLITE_EXTENSION_INIT1
    63     63   #else
    64     64     #include "sqlite3.h"
    65     65   #endif
    66     66   
    67         -#include "sqlite3rtree.h"
    68         -
    69     67   #include <string.h>
    70     68   #include <assert.h>
    71     69   
    72     70   #ifndef SQLITE_AMALGAMATION
           71  +#include "sqlite3rtree.h"
    73     72   typedef sqlite3_int64 i64;
    74     73   typedef unsigned char u8;
    75     74   typedef unsigned int u32;
    76     75   #endif
    77     76   
    78     77   typedef struct Rtree Rtree;
    79     78   typedef struct RtreeCursor RtreeCursor;