merge from dev

2024-03-02 17:26:38 -08:00
parent 10efe291af c6750c51ab
commit 7ff4607f6c
16 changed files with 444 additions and 124 deletions
--- a/src/init.c
+++ b/src/init.c
@@ -455,7 +455,7 @@ void _mi_heap_set_default_direct(mi_heap_t* heap)  {
  #if defined(MI_TLS_SLOT)
  mi_prim_tls_slot_set(MI_TLS_SLOT,heap);
  #elif defined(MI_TLS_PTHREAD_SLOT_OFS)
-  *mi_tls_pthread_heap_slot() = heap;
+  *mi_prim_tls_pthread_heap_slot() = heap;
  #elif defined(MI_TLS_PTHREAD)
  // we use _mi_heap_default_key
  #else