merge from dev-win

2019-08-25 13:12:57 -07:00
parent 80a36f1d7c 23c35f4aba
commit b0e38d5697
10 changed files with 1084 additions and 34 deletions
--- a/include/mimalloc.h
+++ b/include/mimalloc.h
@@ -229,6 +229,7 @@ typedef enum mi_option_e {
  mi_option_decommit,
  mi_option_large_os_pages,         
  mi_option_reserve_huge_os_pages,
+  mi_option_segment_cache,
  mi_option_page_reset,
  mi_option_cache_reset,
  mi_option_reset_decommits,