Merge branch 'dev' into dev-slice

2022-01-10 16:21:15 -08:00
parent a763b6310d 05c2a51211
commit a74c05c6c0
12 changed files with 21 additions and 15 deletions
--- a/include/mimalloc-types.h
+++ b/include/mimalloc-types.h
@@ -447,9 +447,15 @@ struct mi_heap_s {
 // Debug
 // ------------------------------------------------------

+#if !defined(MI_DEBUG_UNINIT)
 #define MI_DEBUG_UNINIT     (0xD0)
+#endif
+#if !defined(MI_DEBUG_FREED)
 #define MI_DEBUG_FREED      (0xDF)
+#endif
+#if !defined(MI_DEBUG_PADDING)
 #define MI_DEBUG_PADDING    (0xDE)
+#endif

 #if (MI_DEBUG)
 // use our own assertion to print without memory allocation