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

fix merge error, issue #955

Browse source
This commit is contained in:
Daan 2024-11-02 06:24:28 -07:00
parent 5cd09cec76
commit 826425d5ab
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/main-override-static.c
View file

@ -20,12 +20,9 @@ static void test_reserved(void);
static void negative_stat(void); static void negative_stat(void);
static void alloc_huge(void); static void alloc_huge(void);
static void test_heap_walk(void); static void test_heap_walk(void);
<<<<<<< HEAD
static void test_heap_arena(void); static void test_heap_arena(void);
static void test_align(void); static void test_align(void);
=======
static void test_canary_leak(void); static void test_canary_leak(void);
>>>>>>> dev
// static void test_large_pages(void); // static void test_large_pages(void);
int main() { int main() {