diff options
author | Daan Leijen <daan@microsoft.com> | 2022-04-09 15:07:07 -0700 |
---|---|---|
committer | Daan Leijen <daan@microsoft.com> | 2022-04-09 15:07:07 -0700 |
commit | 7e492f442002ea8950c446c8ae59629f0e06f027 (patch) | |
tree | e2f3e869b7ca510f96c91ff90101e75a7f57b5e3 /src/init.c | |
parent | 157c9b0966057a88aa3c660a017dbc75810815e3 (diff) | |
parent | faca422b718625e656012391d94c564f5a67d977 (diff) |
merge from dev
Diffstat (limited to 'src/init.c')
-rw-r--r-- | src/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -124,7 +124,7 @@ mi_decl_cache_align static const mi_tld_t tld_empty = { 0, false, NULL, NULL, - { MI_SEGMENT_SPAN_QUEUES_EMPTY, 0, 0, 0, 0, 0, 0, NULL, tld_empty_stats, tld_empty_os }, // segments + { MI_SEGMENT_SPAN_QUEUES_EMPTY, 0, 0, 0, 0, tld_empty_stats, tld_empty_os }, // segments { 0, tld_empty_stats }, // os { MI_STATS_NULL } // stats }; @@ -137,7 +137,7 @@ extern mi_heap_t _mi_heap_main; static mi_tld_t tld_main = { 0, false, &_mi_heap_main, & _mi_heap_main, - { MI_SEGMENT_SPAN_QUEUES_EMPTY, 0, 0, 0, 0, 0, 0, NULL, &tld_main.stats, &tld_main.os }, // segments + { MI_SEGMENT_SPAN_QUEUES_EMPTY, 0, 0, 0, 0, &tld_main.stats, &tld_main.os }, // segments { 0, &tld_main.stats }, // os { MI_STATS_NULL } // stats }; @@ -485,7 +485,7 @@ bool _mi_preloading(void) { return os_preloading; } -bool mi_is_redirected(void) mi_attr_noexcept { +mi_decl_nodiscard bool mi_is_redirected(void) mi_attr_noexcept { return mi_redirected; } |