small fixes, reduced segment size, fix merge conflicts

This commit is contained in:
daan 2020-01-20 22:33:29 -08:00
parent 394a7a92ab
commit 0028272cf4
7 changed files with 45 additions and 41 deletions

View file

@ -16,12 +16,8 @@ terms of the MIT license. A copy of the license can be found in the file
#include "stats.c"
#include "random.c"
#include "os.c"
<<<<<<< HEAD
//#include "memory.c"
=======
#include "arena.c"
#include "memory.c"
>>>>>>> dev
#include "segment.c"
#include "page.c"
#include "heap.c"