From b14ce328eaf0c82dff32ba156ec440ff1a07ac0d Mon Sep 17 00:00:00 2001
From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 27 Dec 2004 16:29:44 +0000
Subject: update

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@821 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/common/malloc.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/common/malloc.h')

diff --git a/src/common/malloc.h b/src/common/malloc.h
index 3733a5e55..7b09d7074 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -3,6 +3,21 @@
 
 #include <stdlib.h>
 
+#if defined(GCOLLECT)
+
+#include "gc.h"
+#define aMalloc(n) GC_MALLOC(n)
+#define aCalloc(m,n) _bcalloc(m,n)
+#define aRealloc(p,n) GC_REALLOC(p,n)
+
+extern void * _bcalloc(size_t, size_t);
+
+#elif defined(BCHECK)
+#define aMalloc(n) malloc(n)
+#define aCalloc(m,n) calloc(m,n)
+#define aRealloc(p,n) realloc(p,n)
+#else
+
 #if __STDC_VERSION__ < 199901L
 # if __GNUC__ >= 2
 #  define __func__ __FUNCTION__
@@ -21,5 +36,6 @@ void* aRealloc_( void *p, size_t size, const char *file, int line, const char *f
 #define aCalloc(m,n) aCalloc_(m,n,ALC_MARK)
 #define aRealloc(p,n) aRealloc_(p,n,ALC_MARK)
 
+#endif
 
 #endif
-- 
cgit v1.2.3-60-g2f50