diff options
author | daan <daanl@outlook.com> | 2019-10-30 15:19:34 -0700 |
---|---|---|
committer | daan <daanl@outlook.com> | 2019-10-30 15:19:34 -0700 |
commit | b73beede344aa8c73bc0606162fece30b51fba46 (patch) | |
tree | c5f54e7e5868e0ab42aa2b93f621416e60868429 /src/init.c | |
parent | 9d4f57abf3993def9eed0bf2b07b66c144b6583c (diff) | |
parent | 4a4d74927ccd7c07e68d28ca372c6c30408ad92f (diff) |
merge from dev
Diffstat (limited to 'src/init.c')
-rw-r--r-- | src/init.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -15,14 +15,14 @@ const mi_page_t _mi_page_empty = { 0, false, false, false, false, 0, 0, { 0 }, false, NULL, // free - #if MI_SECURE + #if MI_ENCODE_FREELIST 0, #endif 0, // used NULL, ATOMIC_VAR_INIT(0), ATOMIC_VAR_INIT(0), 0, NULL, NULL, NULL - #if (MI_SECURE==0) + #ifndef MI_ENCODE_FREELIST , { NULL } // padding #endif }; @@ -64,8 +64,8 @@ const mi_page_t _mi_page_empty = { MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \ MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \ MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \ - MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \ - MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \ + MI_STAT_COUNT_NULL(), \ + { 0, 0 }, { 0, 0 }, { 0, 0 }, \ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } \ MI_STAT_COUNT_END_NULL() |