| Index: third_party/sqlite/src/ext/fts3/fts3_test.c
|
| diff --git a/third_party/sqlite/src/ext/fts3/fts3_test.c b/third_party/sqlite/src/ext/fts3/fts3_test.c
|
| index 36dcc94e6dabcca9aa220eb04cf49bf4cad30878..a48a556c98f08151698eb3e606726aee6d18e68c 100644
|
| --- a/third_party/sqlite/src/ext/fts3/fts3_test.c
|
| +++ b/third_party/sqlite/src/ext/fts3/fts3_test.c
|
| @@ -18,7 +18,14 @@
|
| ** that the sqlite3_tokenizer_module.xLanguage() method is invoked correctly.
|
| */
|
|
|
| -#include <tcl.h>
|
| +#if defined(INCLUDE_SQLITE_TCL_H)
|
| +# include "sqlite_tcl.h"
|
| +#else
|
| +# include "tcl.h"
|
| +# ifndef SQLITE_TCLAPI
|
| +# define SQLITE_TCLAPI
|
| +# endif
|
| +#endif
|
| #include <string.h>
|
| #include <assert.h>
|
|
|
| @@ -143,7 +150,7 @@ static int nm_match_count(
|
| /*
|
| ** Tclcmd: fts3_near_match DOCUMENT EXPR ?OPTIONS?
|
| */
|
| -static int fts3_near_match_cmd(
|
| +static int SQLITE_TCLAPI fts3_near_match_cmd(
|
| ClientData clientData,
|
| Tcl_Interp *interp,
|
| int objc,
|
| @@ -278,7 +285,7 @@ static int fts3_near_match_cmd(
|
| ** # Restore initial incr-load settings:
|
| ** eval fts3_configure_incr_load $cfg
|
| */
|
| -static int fts3_configure_incr_load_cmd(
|
| +static int SQLITE_TCLAPI fts3_configure_incr_load_cmd(
|
| ClientData clientData,
|
| Tcl_Interp *interp,
|
| int objc,
|
| @@ -458,7 +465,7 @@ static int testTokenizerNext(
|
| if( pCsr->iLangid & 0x00000001 ){
|
| for(i=0; i<nToken; i++) pCsr->aBuffer[i] = pToken[i];
|
| }else{
|
| - for(i=0; i<nToken; i++) pCsr->aBuffer[i] = testTolower(pToken[i]);
|
| + for(i=0; i<nToken; i++) pCsr->aBuffer[i] = (char)testTolower(pToken[i]);
|
| }
|
| pCsr->iToken++;
|
| pCsr->iInput = (int)(p - pCsr->aInput);
|
| @@ -488,7 +495,7 @@ static int testTokenizerLanguage(
|
| }
|
| #endif
|
|
|
| -static int fts3_test_tokenizer_cmd(
|
| +static int SQLITE_TCLAPI fts3_test_tokenizer_cmd(
|
| ClientData clientData,
|
| Tcl_Interp *interp,
|
| int objc,
|
| @@ -517,7 +524,7 @@ static int fts3_test_tokenizer_cmd(
|
| return TCL_OK;
|
| }
|
|
|
| -static int fts3_test_varint_cmd(
|
| +static int SQLITE_TCLAPI fts3_test_varint_cmd(
|
| ClientData clientData,
|
| Tcl_Interp *interp,
|
| int objc,
|
| @@ -526,7 +533,8 @@ static int fts3_test_varint_cmd(
|
| #ifdef SQLITE_ENABLE_FTS3
|
| char aBuf[24];
|
| int rc;
|
| - Tcl_WideInt w, w2;
|
| + Tcl_WideInt w;
|
| + sqlite3_int64 w2;
|
| int nByte, nByte2;
|
|
|
| if( objc!=2 ){
|
|
|