aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc
diff options
context:
space:
mode:
Diffstat (limited to 'src/alloc')
-rw-r--r--src/alloc/free.c6
-rw-r--r--src/alloc/malloc.c10
2 files changed, 13 insertions, 3 deletions
diff --git a/src/alloc/free.c b/src/alloc/free.c
index 90d16d5..67b54bd 100644
--- a/src/alloc/free.c
+++ b/src/alloc/free.c
@@ -6,5 +6,9 @@
#include <alloc.h>
-extern inline void calt_free(void *ptr);
+void calt_free(void *ptr) {
+ if (ptr) {
+ calt_get_alloc().free(ptr);
+ }
+}
diff --git a/src/alloc/malloc.c b/src/alloc/malloc.c
index 3abcf2e..3c354c0 100644
--- a/src/alloc/malloc.c
+++ b/src/alloc/malloc.c
@@ -6,5 +6,11 @@
#include <alloc.h>
-extern inline void *calt_malloc(size_t size);
-
+void *calt_malloc(size_t size) {
+ if (size) {
+ struct calt_alloc alloc = calt_get_alloc();
+ return alloc.malloc ? alloc.malloc(size) : NULL;
+ } else {
+ return NULL;
+ }
+}