aboutsummaryrefslogtreecommitdiff
path: root/src/scoped_allocator.c
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2019-02-24 17:53:46 +0100
committerdec05eba <dec05eba@protonmail.com>2020-07-25 14:36:46 +0200
commita27a3e6ae09e8396584c95a3567b145e86d8bc40 (patch)
tree6b56721fb64f31e4b731e75942f81838d10b0612 /src/scoped_allocator.c
parenta307f17f44b461f58441926fcbf87883f17ebe61 (diff)
Fixed CHECK_RESULT macro, use scoped allocator
Scoped allocator gives us better performance and cleanup code for error cases is much cleaner
Diffstat (limited to 'src/scoped_allocator.c')
-rw-r--r--src/scoped_allocator.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/scoped_allocator.c b/src/scoped_allocator.c
index ea99774..bd14206 100644
--- a/src/scoped_allocator.c
+++ b/src/scoped_allocator.c
@@ -2,7 +2,11 @@
#include "../include/alloc.h"
#include <assert.h>
+<<<<<<< HEAD
#define ALLOC_NODE_SIZE 4096
+=======
+#define ALLOC_NODE_SIZE 65536
+>>>>>>> Fixed CHECK_RESULT macro, use scoped allocator
int scoped_allocator_node_init(ScopedAllocatorNode *self) {
self->data = NULL;