Merge branch 'dev' into dev-win

This commit is contained in:
daan 2019-08-19 21:23:04 -07:00
commit 05631ebfc4
6 changed files with 33 additions and 14 deletions

View file

@ -106,14 +106,14 @@ mi_heap_t _mi_heap_main = {
MI_SMALL_PAGES_EMPTY,
MI_PAGE_QUEUES_EMPTY,
NULL,
0,
0,
0, // thread id
#if MI_INTPTR_SIZE==8 // the cookie of the main heap can be fixed (unlike page cookies that need to be secure!)
0xCDCDCDCDCDCDCDCDUL,
#else
0xCDCDCDCDUL,
#endif
0,
0, // random
0, // page count
false // can reclaim
};