Delete workaround for classic zlib (#106659)

dotnet · Aug 20, 2024 · b3481b4 · b3481b4
1 parent cee502f
commit b3481b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/native/libs/System.IO.Compression.Native/CMakeLists.txt b/src/native/libs/System.IO.Compression.Native/CMakeLists.txt
@@ -46,10 +46,6 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
     # Disable implicit fallthrough warning for Zlib and Brotli
     set(FLAGS -Wno-implicit-fallthrough)
 
-    # Disable no strict prototypes warning for Zlib
-    # https://github.com/madler/zlib/issues/633
-    set(FLAGS "${FLAGS} -Wno-strict-prototypes")
-
     # Delete this suppression once brotli is upgraded to vNext (current latest v1.0.9
     # does not contain upstream fix: https://github.com/google/brotli/commit/0a3944c)
     if (NOT CLR_CMAKE_TARGET_WASI)

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
@@ -73,10 +73,7 @@ static void WriteAllocCookieUnaligned(void* pDest, DOTNET_ALLOC_COOKIE vCookie)
 const size_t DOTNET_ALLOC_HEADER_COOKIE_SIZE_WITH_PADDING = (sizeof(DOTNET_ALLOC_COOKIE) + MEMORY_ALLOCATION_ALIGNMENT - 1) & ~((size_t)MEMORY_ALLOCATION_ALIGNMENT  - 1);
 const size_t DOTNET_ALLOC_TRAILER_COOKIE_SIZE = sizeof(DOTNET_ALLOC_COOKIE);
 
-voidpf z_custom_calloc(opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
+voidpf z_custom_calloc(voidpf opaque, unsigned items, unsigned size)
 {
     (void)opaque; // unreferenced formal parameter
 
@@ -122,9 +119,7 @@ static void zcfree_trash_cookie(void* pCookie)
     memset(pCookie, 0, sizeof(DOTNET_ALLOC_COOKIE));
 }
 
-void z_custom_cfree(opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
+void z_custom_cfree(voidpf opaque, voidpf ptr)
 {
     (void)opaque; // unreferenced formal parameter