diff options
| author | drh <drh@noemail.net> | 2011-08-25 18:54:46 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2011-08-25 18:54:46 +0000 |
| commit | 860e332cdc69be7642382bb9b944298239ff559c (patch) | |
| tree | 96593330e8433c44713c4710efbd034efe2b960d /src | |
| parent | d7f6e906db4e97accd60d5e3dd829d64d66202dd (diff) | |
| download | sqlite-860e332cdc69be7642382bb9b944298239ff559c.tar.gz sqlite-860e332cdc69be7642382bb9b944298239ff559c.zip | |
Fix harmless compiler warnings in test code. No changes to the core.
FossilOrigin-Name: 16f83fec77668c021694fbb189b415bd3b90adc8
Diffstat (limited to 'src')
| -rw-r--r-- | src/test_malloc.c | 4 | ||||
| -rw-r--r-- | src/test_rtree.c | 2 | ||||
| -rw-r--r-- | src/test_thread.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/test_malloc.c b/src/test_malloc.c index 5023dca44..46ec94d32 100644 --- a/src/test_malloc.c +++ b/src/test_malloc.c @@ -1222,7 +1222,7 @@ static int test_dump_memsys3( return TCL_ERROR; } - switch( (int)clientData ){ + switch( SQLITE_PTR_TO_INT(clientData) ){ case 3: { #ifdef SQLITE_ENABLE_MEMSYS3 extern void sqlite3Memsys3Dump(const char*); @@ -1460,7 +1460,7 @@ int Sqlitetest_malloc_Init(Tcl_Interp *interp){ }; int i; for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){ - ClientData c = (ClientData)aObjCmd[i].clientData; + ClientData c = (ClientData)SQLITE_INT_TO_PTR(aObjCmd[i].clientData); Tcl_CreateObjCommand(interp, aObjCmd[i].zName, aObjCmd[i].xProc, c, 0); } return TCL_OK; diff --git a/src/test_rtree.c b/src/test_rtree.c index 5fc994ddf..9745b0054 100644 --- a/src/test_rtree.c +++ b/src/test_rtree.c @@ -18,6 +18,7 @@ /* Solely for the UNUSED_PARAMETER() macro. */ #include "sqliteInt.h" +#ifdef SQLITE_ENABLE_RTREE /* ** Type used to cache parameter information for the "circle" r-tree geometry ** callback. @@ -230,6 +231,7 @@ static int cube_geom( return SQLITE_OK; } +#endif /* SQLITE_ENABLE_RTREE */ static int register_cube_geom( void * clientData, diff --git a/src/test_thread.c b/src/test_thread.c index 3a13dd668..08df14c2c 100644 --- a/src/test_thread.c +++ b/src/test_thread.c @@ -305,7 +305,7 @@ static int sqlthread_id( Tcl_Obj *CONST objv[] ){ Tcl_ThreadId id = Tcl_GetCurrentThread(); - Tcl_SetObjResult(interp, Tcl_NewIntObj((int)id)); + Tcl_SetObjResult(interp, Tcl_NewIntObj(SQLITE_PTR_TO_INT(id))); UNUSED_PARAMETER(clientData); UNUSED_PARAMETER(objc); UNUSED_PARAMETER(objv); |