summaryrefslogtreecommitdiff
path: root/src/common/malloc.c
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-12 16:26:53 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-12 16:26:53 +0000
commitc2da0a3c7938b6461c3293b31d0e2f0db723f8d3 (patch)
treeb5f02fcb696fd2be0c21529238cc14161d814387 /src/common/malloc.c
parent2eb9dcd521e8c726f8731e3bdfcc2e0f2e675225 (diff)
downloadhercules-c2da0a3c7938b6461c3293b31d0e2f0db723f8d3.tar.gz
hercules-c2da0a3c7938b6461c3293b31d0e2f0db723f8d3.tar.bz2
hercules-c2da0a3c7938b6461c3293b31d0e2f0db723f8d3.tar.xz
hercules-c2da0a3c7938b6461c3293b31d0e2f0db723f8d3.zip
Fixed all warnings left from when compiling with -pedantic, confirmed with gcc, llvm and clang.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16415 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/malloc.c')
-rw-r--r--src/common/malloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/malloc.c b/src/common/malloc.c
index 1769e0982..9976a28d5 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -327,7 +327,7 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func )
head->size = (unsigned short)size;
*(long*)((char*)head + sizeof(struct unit_head) - sizeof(long) + size) = 0xdeadbeaf;
return (char *)head + sizeof(struct unit_head) - sizeof(long);
-};
+}
void* _mcalloc(size_t num, size_t size, const char *file, int line, const char *func )
{