From bb0488451bdc08e6abe7622d10bbcb4135f2dc8f Mon Sep 17 00:00:00 2001 From: ultramage Date: Sun, 27 Apr 2008 11:09:57 +0000 Subject: Corrected r12662 where a guild break would trigger the OnGuildBreak event for all castles (even of other guilds). Corrected some x64 compilation warnings in ers/malloc files. cleaned up a case of bad variable reuse. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12666 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common/malloc.c') diff --git a/src/common/malloc.c b/src/common/malloc.c index 93d03107b..c64f757bd 100644 --- a/src/common/malloc.c +++ b/src/common/malloc.c @@ -509,7 +509,7 @@ static void block_free(struct block* p) hash_unfill[0] = p; } -unsigned int memmgr_usage (void) +size_t memmgr_usage (void) { return memmgr_usage_bytes / 1024; } @@ -665,7 +665,7 @@ bool malloc_verify(void* ptr) #endif } -unsigned int malloc_usage (void) +size_t malloc_usage (void) { #ifdef USE_MEMMGR return memmgr_usage (); -- cgit v1.2.3-60-g2f50