merge from dev

2023-03-29 12:31:49 -07:00
parent cbd7f94a44 068d1d8842
commit 42c8015cbc
7 changed files with 33 additions and 15 deletions
--- a/test/test-api-fill.c
+++ b/test/test-api-fill.c
@@ -164,7 +164,7 @@ int main(void) {
    mi_free(p);
  };

-#if MI_DEBUG >= 2
+#if (MI_DEBUG >= 2) && !MI_TSAN
  // ---------------------------------------------------
  // Debug filling
  // ---------------------------------------------------