diff options
| author | dec05eba <dec05eba@protonmail.com> | 2019-02-24 18:29:26 +0100 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2020-07-25 14:36:46 +0200 |
| commit | 204a1cc2b01ed3f18cb3e33bd6aa756d1f99dda8 (patch) | |
| tree | c51cf47303f852cb910a68bb3255dc3d9b321781 /src/scoped_allocator.c | |
| parent | a27a3e6ae09e8396584c95a3567b145e86d8bc40 (diff) | |
Fix rebase error
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; |