kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-07 15:59:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from dev-exp; resolve conflicts

Browse source
This commit is contained in:
daan 2020-01-27 22:14:10 -08:00
parent b50bec463d
commit 09b98e0f7f
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -21,10 +21,6 @@ set(mi_sources
src/random.c src/random.c
src/os.c src/os.c
src/arena.c src/arena.c
<<<<<<< HEAD
=======
src/region.c
>>>>>>> dev-exp
src/segment.c src/segment.c
src/page.c src/page.c
src/alloc.c src/alloc.c

4
src/static.c
View file

@ -18,10 +18,6 @@ terms of the MIT license. A copy of the license can be found in the file
#include "os.c" #include "os.c"
//#include "memory.c" //#include "memory.c"
#include "arena.c" #include "arena.c"
<<<<<<< HEAD
=======
#include "region.c"
>>>>>>> dev-exp
#include "segment.c" #include "segment.c"
#include "page.c" #include "page.c"
#include "heap.c" #include "heap.c"