fix includes

This commit is contained in:
Daan Leijen 2023-03-20 11:06:28 -07:00
parent 3fc30c4a1e
commit 993c0a49b4
2 changed files with 3 additions and 10 deletions

View file

@ -11,10 +11,10 @@ terms of the MIT license. A copy of the license can be found in the file
The full memory map of all segments is also implemented here. The full memory map of all segments is also implemented here.
-----------------------------------------------------------------------------*/ -----------------------------------------------------------------------------*/
#include "mimalloc.h" #include "mimalloc.h"
#include "mimalloc-internal.h" #include "mimalloc/internal.h"
#include "mimalloc-atomic.h" #include "mimalloc/atomic.h"
#include "bitmap.h" // atomic bitmap #include "./bitmap.h" // atomic bitmap
//#define MI_CACHE_DISABLE 1 // define to completely disable the segment cache //#define MI_CACHE_DISABLE 1 // define to completely disable the segment cache

View file

@ -29,15 +29,8 @@ terms of the MIT license. A copy of the license can be found in the file
#include "init.c" #include "init.c"
#include "options.c" #include "options.c"
#include "os.c" #include "os.c"
<<<<<<< HEAD
#include "page.c"
#include "prim/prim.c"
#include "random.c"
=======
#include "page.c" // includes page-queue.c #include "page.c" // includes page-queue.c
#include "random.c" #include "random.c"
#include "region.c"
>>>>>>> dev-platform
#include "segment.c" #include "segment.c"
#include "segment-cache.c" #include "segment-cache.c"
#include "stats.c" #include "stats.c"