summaryrefslogtreecommitdiff
path: root/src/common/malloc.h
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-27 11:09:57 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-27 11:09:57 +0000
commitbb0488451bdc08e6abe7622d10bbcb4135f2dc8f (patch)
tree9b981f46337325e893178f641dae39399fd6118d /src/common/malloc.h
parentaf99be9bd11d716e0b8ef8eab4a36c9b9925e4c8 (diff)
downloadhercules-bb0488451bdc08e6abe7622d10bbcb4135f2dc8f.tar.gz
hercules-bb0488451bdc08e6abe7622d10bbcb4135f2dc8f.tar.bz2
hercules-bb0488451bdc08e6abe7622d10bbcb4135f2dc8f.tar.xz
hercules-bb0488451bdc08e6abe7622d10bbcb4135f2dc8f.zip
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
Diffstat (limited to 'src/common/malloc.h')
-rw-r--r--src/common/malloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 609f0a700..aaf3e318d 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -156,7 +156,7 @@
////////////////////////////////////////////////
bool malloc_verify(void* ptr);
-unsigned int malloc_usage (void);
+size_t malloc_usage (void);
void malloc_init (void);
void malloc_final (void);