From a27a3e6ae09e8396584c95a3567b145e86d8bc40 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sun, 24 Feb 2019 17:53:46 +0100
Subject: Fixed CHECK_RESULT macro, use scoped allocator

Scoped allocator gives us better performance and cleanup code for error
cases is much cleaner
---
 src/scoped_allocator.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/scoped_allocator.c')

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;
-- 
cgit v1.2.3