diff options
Diffstat (limited to 'src/scoped_allocator.c')
| -rw-r--r-- | src/scoped_allocator.c | 4 |
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; |