diff options
Diffstat (limited to 'src/scoped_allocator.c')
| -rw-r--r-- | src/scoped_allocator.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/scoped_allocator.c b/src/scoped_allocator.c index bd14206..cbf1aad 100644 --- a/src/scoped_allocator.c +++ b/src/scoped_allocator.c @@ -2,11 +2,7 @@ #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; |