summaryrefslogtreecommitdiff
path: root/src/common/malloc.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/malloc.h')
-rw-r--r--src/common/malloc.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 860f8dd7b..b37c3b799 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -9,23 +9,39 @@
#define aMalloc(size) \
dmalloc_malloc(__FILE__, __LINE__, (size), DMALLOC_FUNC_MALLOC, 0, 0)
+#define aMallocA(size) \
+ dmalloc_malloc(__FILE__, __LINE__, (size), DMALLOC_FUNC_MALLOC, 0, 0)
+#define aCallocA(count,size) \
+ dmalloc_malloc(__FILE__, __LINE__, (count)*(size), DMALLOC_FUNC_CALLOC, 0, 0)
#define aCalloc(count,size) \
dmalloc_malloc(__FILE__, __LINE__, (count)*(size), DMALLOC_FUNC_CALLOC, 0, 0)
#define aRealloc(ptr,size) \
dmalloc_realloc(__FILE__, __LINE__, (ptr), (size), DMALLOC_FUNC_REALLOC, 0)
+#define aFree(ptr) free(ptr)
+#define aStrdup(ptr) strdup(ptr)
#elif defined(GCOLLECT)
#include "gc.h"
#define aMalloc(n) GC_MALLOC(n)
+#define aMallocA(n) GC_MALLOC_ATOMIC(n)
+#define aCallocA(m,n) _bcallocA(m,n)
#define aCalloc(m,n) _bcalloc(m,n)
#define aRealloc(p,n) GC_REALLOC(p,n)
+#define aFree(n) GC_FREE(n)
+#define aStrdup(n) _bstrdup(n)
extern void * _bcalloc(size_t, size_t);
+extern void * _bcallocA(size_t, size_t);
+extern char * _bstrdup(const char *);
#elif defined(BCHECK)
#define aMalloc(n) malloc(n)
+#define aMallocA(n) malloc(n)
#define aCalloc(m,n) calloc(m,n)
+#define aCallocA(m,n) calloc(m,n)
#define aRealloc(p,n) realloc(p,n)
+#define aFree(n) free(n)
+#define aStrdup(n) strdup(n)
#else
#if __STDC_VERSION__ < 199901L
@@ -43,8 +59,12 @@ void* aCalloc_( size_t num, size_t size, const char *file, int line, const char
void* aRealloc_( void *p, size_t size, const char *file, int line, const char *func );
#define aMalloc(n) aMalloc_(n,ALC_MARK)
+#define aMallocA(n) aMalloc_(n,ALC_MARK)
#define aCalloc(m,n) aCalloc_(m,n,ALC_MARK)
+#define aCallocA(m,n) aCalloc_(m,n,ALC_MARK)
#define aRealloc(p,n) aRealloc_(p,n,ALC_MARK)
+#define aFree(ptr) free(ptr)
+#define aStrdup(ptr) strdup(ptr)
#endif