diff options
author | drh <drh@noemail.net> | 2015-12-02 20:40:26 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2015-12-02 20:40:26 +0000 |
commit | 1bb15fc973f5b1b472897095f629abcc663bd453 (patch) | |
tree | 4eda31846a69354eb5ba5ff9dc91602a18d942ac /src/test_malloc.c | |
parent | 769dc6e2a22b3104583ad357b01f31a22e146a5c (diff) | |
parent | f7ce4291a94573cdb04e5f3fcf59ed9e69226479 (diff) | |
download | sqlite-1bb15fc973f5b1b472897095f629abcc663bd453.tar.gz sqlite-1bb15fc973f5b1b472897095f629abcc663bd453.zip |
Merge recent enhancements from trunk.
FossilOrigin-Name: d1a1278d7f3306536dc9cbd8fb300898f1e373e8
Diffstat (limited to 'src/test_malloc.c')
-rw-r--r-- | src/test_malloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test_malloc.c b/src/test_malloc.c index 3ab177dcb..a3ff9d205 100644 --- a/src/test_malloc.c +++ b/src/test_malloc.c @@ -910,7 +910,7 @@ static int test_config_scratch( free(buf); if( sz<0 ){ buf = 0; - rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, 0, 0, 0); + rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, (void*)0, 0, 0); }else{ buf = malloc( sz*N + 1 ); rc = sqlite3_config(SQLITE_CONFIG_SCRATCH, buf, sz, N); @@ -957,7 +957,7 @@ static int test_config_pagecache( Tcl_SetObjResult(interp, pRes); if( sz<0 ){ - sqlite3_config(SQLITE_CONFIG_PAGECACHE, 0, 0, 0); + sqlite3_config(SQLITE_CONFIG_PAGECACHE, (void*)0, 0, 0); }else{ buf = malloc( sz*N ); sqlite3_config(SQLITE_CONFIG_PAGECACHE, buf, sz, N); |