merge from dev

2023-04-23 13:06:50 -07:00
parent 6303cd46cf a59ae585c7
commit 2d85abdece
6 changed files with 34 additions and 31 deletions
--- a/src/options.c
+++ b/src/options.c
@@ -88,8 +88,7 @@ static mi_option_desc_t options[_mi_option_last] =
  #else
  {  128L * 1024L, UNINIT, MI_OPTION(arena_reserve) },
  #endif
-  { 10,  UNINIT, MI_OPTION(arena_purge_mult) },         // purge delay multiplier for arena's
-  { 1,   UNINIT, MI_OPTION(allow_purge) },              // allow decommit/reset to free (physical) memory back to the OS
+  { 10,  UNINIT, MI_OPTION(arena_purge_mult) },        // purge delay multiplier for arena's
  { 1,   UNINIT, MI_OPTION_LEGACY(purge_extend_delay, decommit_extend_delay) },
 };