diff options
| author | drh <> | 2024-07-31 22:36:14 +0000 |
|---|---|---|
| committer | drh <> | 2024-07-31 22:36:14 +0000 |
| commit | a1291e79d3d0c8b6aa40b455151b988a92879e17 (patch) | |
| tree | 7eca588d2e68bb910d8e9a7ce3957997309a2f79 /src/test5.c | |
| parent | 07f215ad9e3606253d9bc52d59e46a9c7d9a1b63 (diff) | |
| parent | b030bc698088aef9789763123de0f6dcd374cba4 (diff) | |
| download | sqlite-a1291e79d3d0c8b6aa40b455151b988a92879e17.tar.gz sqlite-a1291e79d3d0c8b6aa40b455151b988a92879e17.zip | |
Fix the tclsqlite.c TCL interface module so that it works with both Tcl8 and
Tcl9. Make changes across the TCL-based test harness to enable SQLite to
be tested with either Tcl8 or Tcl9. Get the --with-tcl= argument on the
configure script working. Testing changes only - no changes to the SQLite core.
I believe the previous merge attempt didn't work because of errors in the
merge itself, not because of faults in the code. Trying again...
FossilOrigin-Name: ea9d88f9ca3399bca83bf03893689a927b73e481604b94527e42de43f103eb46
Diffstat (limited to 'src/test5.c')
| -rw-r--r-- | src/test5.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/test5.c b/src/test5.c index 0d9242862..334b5d07f 100644 --- a/src/test5.c +++ b/src/test5.c @@ -17,11 +17,7 @@ */ #include "sqliteInt.h" #include "vdbeInt.h" -#if defined(INCLUDE_SQLITE_TCL_H) -# include "sqlite_tcl.h" -#else -# include "tcl.h" -#endif +#include "tclsqlite.h" #include <stdlib.h> #include <string.h> @@ -36,7 +32,7 @@ static int SQLITE_TCLAPI binarize( int objc, Tcl_Obj *CONST objv[] ){ - int len; + Tcl_Size len; char *bytes; Tcl_Obj *pRet; assert(objc==2); @@ -133,7 +129,7 @@ static int SQLITE_TCLAPI test_translate( sqlite3_value *pVal; char *z; - int len; + Tcl_Size len; void (*xDel)(void *p) = SQLITE_STATIC; if( objc!=4 && objc!=5 ){ @@ -164,7 +160,7 @@ static int SQLITE_TCLAPI test_translate( z = (char*)Tcl_GetByteArrayFromObj(objv[1], &len); if( objc==5 ){ char *zTmp = z; - z = sqlite3_malloc(len); + z = sqlite3_malloc64(len); memcpy(z, zTmp, len); } sqlite3ValueSetStr(pVal, -1, z, enc_from, xDel); |