Remove custom allocator.

dotnet · Sep 5, 2024 · c62bc5b · c62bc5b
1 parent 12bc7ed
commit c62bc5b
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 349 deletions.
diff --git a/src/native/libs/System.IO.Compression.Native/CMakeLists.txt b/src/native/libs/System.IO.Compression.Native/CMakeLists.txt
@@ -14,12 +14,6 @@ set(NATIVECOMPRESSION_SOURCES
     pal_zlib.c
 )
 
-if (HOST_WIN32 OR CLR_CMAKE_TARGET_WIN32)
-    list(APPEND NATIVECOMPRESSION_SOURCES "zlib_allocator_win.c")
-else()
-    list(APPEND NATIVECOMPRESSION_SOURCES "zlib_allocator_unix.c")
-endif()
-
 if (NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
 
     if (CLR_CMAKE_USE_SYSTEM_BROTLI)

diff --git a/src/native/libs/System.IO.Compression.Native/pal_zlib.c b/src/native/libs/System.IO.Compression.Native/pal_zlib.c
@@ -11,7 +11,6 @@
 #else
     #include "pal_utilities.h"
 #endif
-#include <zlib_allocator.h>
 #include <zlib.h>
 
 c_static_assert(PAL_Z_NOFLUSH == Z_NO_FLUSH);
@@ -40,9 +39,6 @@ static int32_t Init(PAL_ZStream* stream)
 {
     z_stream* zStream = (z_stream*)calloc(1, sizeof(z_stream));
 
-    zStream->zalloc = z_custom_calloc;
-    zStream->zfree = z_custom_cfree;
-
     stream->internalState = zStream;
 
     if (zStream != NULL)

diff --git a/src/native/libs/System.IO.Compression.Native/zlib_allocator.h b/src/native/libs/System.IO.Compression.Native/zlib_allocator.h
diff --git a/src/native/libs/System.IO.Compression.Native/zlib_allocator_unix.c b/src/native/libs/System.IO.Compression.Native/zlib_allocator_unix.c
diff --git a/src/native/libs/System.IO.Compression.Native/zlib_allocator_win.c b/src/native/libs/System.IO.Compression.Native/zlib_allocator_win.c