Loading...
--- libmalloc/libmalloc-374.100.5/src/platform.h
+++ libmalloc/libmalloc-283.40.1/src/platform.h
@@ -44,13 +44,12 @@
 #endif // MALLOC_TARGET_IOS
 
 // <rdar://problem/12596555>
-#define CONFIG_RECIRC_DEPOT 1
-#define CONFIG_AGGRESSIVE_MADVISE 1
-
 #if MALLOC_TARGET_IOS
-# define DEFAULT_AGGRESSIVE_MADVISE_ENABLED true
+# define CONFIG_RECIRC_DEPOT 1
+# define CONFIG_AGGRESSIVE_MADVISE 1
 #else // MALLOC_TARGET_IOS
-# define DEFAULT_AGGRESSIVE_MADVISE_ENABLED false
+# define CONFIG_RECIRC_DEPOT 1
+# define CONFIG_AGGRESSIVE_MADVISE 0
 #endif // MALLOC_TARGET_IOS
 
 // <rdar://problem/10397726>
@@ -69,15 +68,6 @@
 
 // enable nano checking for corrupt free list
 #define NANO_FREE_DEQUEUE_DILIGENCE 1
-
-// Conditional behaviour depends on MallocSpaceEfficient being set by
-// JetsamProperties which isn't true on iOS
-#if MALLOC_TARGET_IOS || TARGET_OS_DRIVERKIT
-#define NANOV2_DEFAULT_MODE NANO_ENABLED
-#else
-#define NANOV2_DEFAULT_MODE NANO_CONDITIONAL
-#endif
-
 
 // This governs a last-free cache of 1 that bypasses the free-list for each region size
 #define CONFIG_TINY_CACHE 1
@@ -102,10 +92,6 @@
 #define CONFIG_LARGE_CACHE 1
 #endif
 
-#if CONFIG_LARGE_CACHE
-#define DEFAULT_LARGE_CACHE_ENABLED true
-#endif
-
 #if MALLOC_TARGET_IOS
 // The VM system on iOS forces malloc-tagged memory to never be marked as
 // copy-on-write, this would include calls we make to vm_copy. Given that the
@@ -122,19 +108,6 @@
 #define ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING 1
 #endif
 
-#if !TARGET_OS_DRIVERKIT && (!TARGET_OS_OSX || MALLOC_TARGET_64BIT)
-#define CONFIG_FEATUREFLAGS_SIMPLE 1
-#else
-#define CONFIG_FEATUREFLAGS_SIMPLE 0
-#endif
-
-// Quarantine zone, only useful on macOS (+ DriverKit, 64-bit simulators).
-#if (TARGET_OS_OSX || TARGET_OS_DRIVERKIT || TARGET_OS_SIMULATOR) && MALLOC_TARGET_64BIT
-#define CONFIG_QUARANTINE 1
-#else
-#define CONFIG_QUARANTINE 0
-#endif
-
 // presence of commpage memsize
 #define CONFIG_HAS_COMMPAGE_MEMSIZE 1
 
@@ -146,11 +119,4 @@
 #define CONFIG_TINY_USES_HYPER_SHIFT 0
 #define CONFIG_SMALL_USES_HYPER_SHIFT 0
 
-// FIXME: limit number of malloc_create_zone() wrapper zones for watchOS to remove this
-#if TARGET_OS_OSX || TARGET_OS_IOS
-#define CONFIG_PGM_WRAP_CUSTOM_ZONES 1
-#else
-#define CONFIG_PGM_WRAP_CUSTOM_ZONES 0
-#endif
-
 #endif // __PLATFORM_H