diff options
| author | stephan <stephan@noemail.net> | 2024-08-12 13:31:43 +0000 |
|---|---|---|
| committer | stephan <stephan@noemail.net> | 2024-08-12 13:31:43 +0000 |
| commit | 57a0af406e66af40b4f0d4235d25155f80046db2 (patch) | |
| tree | 4f50fd11858d7c92efccdeac7923c874434fccab /ext/rtree/test_rtreedoc.c | |
| parent | d35a69a8da0a5a5c54823df540f0217c1601816b (diff) | |
| parent | 8c411f7fceffe287b5f94cf449550ee5d6c11601 (diff) | |
| download | sqlite-57a0af406e66af40b4f0d4235d25155f80046db2.tar.gz sqlite-57a0af406e66af40b4f0d4235d25155f80046db2.zip | |
Merge current trunk into this branch.
FossilOrigin-Name: 900a593ddf51eebddb70e2e9ab16abe4911f58f23e574e88ed340a919b8f16b6
Diffstat (limited to 'ext/rtree/test_rtreedoc.c')
| -rw-r--r-- | ext/rtree/test_rtreedoc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/rtree/test_rtreedoc.c b/ext/rtree/test_rtreedoc.c index cdbcb2e8d..0c042d05a 100644 --- a/ext/rtree/test_rtreedoc.c +++ b/ext/rtree/test_rtreedoc.c @@ -14,11 +14,7 @@ */ #include "sqlite3.h" -#if defined(INCLUDE_SQLITE_TCL_H) -# include "sqlite_tcl.h" -#else -# include "tcl.h" -#endif +#include "tclsqlite.h" /* Solely for the UNUSED_PARAMETER() macro. */ #include "sqliteInt.h" @@ -90,7 +86,7 @@ static int invokeTclGeomCb( if( rc!=TCL_OK ){ rc = SQLITE_ERROR; }else{ - int nObj = 0; + Tcl_Size nObj = 0; Tcl_Obj **aObj = 0; pRes = Tcl_GetObjResult(interp); @@ -279,7 +275,7 @@ static int box_query(sqlite3_rtree_query_info *pInfo){ if( rc==SQLITE_OK ){ double rScore = 0.0; - int nObj = 0; + Tcl_Size nObj = 0; int eP = 0; Tcl_Obj **aObj = 0; Tcl_Obj *pRes = Tcl_GetObjResult(interp); |