diff options
Diffstat (limited to 'src/malloc.c')
| -rw-r--r-- | src/malloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/malloc.c b/src/malloc.c index 1950e048b..ba0122df6 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -12,7 +12,7 @@ ** ** Memory allocation functions used throughout sqlite. ** -** $Id: malloc.c,v 1.50 2008/12/10 19:26:24 drh Exp $ +** $Id: malloc.c,v 1.51 2008/12/10 21:19:57 drh Exp $ */ #include "sqliteInt.h" #include <stdarg.h> @@ -50,7 +50,7 @@ void sqlite3_soft_heap_limit(int n){ }else{ sqlite3MemoryAlarm(0, 0, 0); } - overage = sqlite3_memory_used() - n; + overage = (int)(sqlite3_memory_used() - (i64)n); if( overage>0 ){ sqlite3_release_memory(overage); } @@ -385,7 +385,7 @@ void sqlite3ScratchFree(void *p){ } }else{ int i; - i = (u8 *)p - (u8 *)sqlite3GlobalConfig.pScratch; + i = (int)((u8*)p - (u8*)sqlite3GlobalConfig.pScratch); i /= sqlite3GlobalConfig.szScratch; assert( i>=0 && i<sqlite3GlobalConfig.nScratch ); sqlite3_mutex_enter(mem0.mutex); |