mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-09-18 04:04:47 +03:00
small fixes, reduced segment size, fix merge conflicts
This commit is contained in:
parent
394a7a92ab
commit
0028272cf4
7 changed files with 45 additions and 41 deletions
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue