Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete workaround for classic zlib #106659

Merged
merged 2 commits into from
Aug 20, 2024
Merged

Delete workaround for classic zlib #106659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa834a8
Delete workaround for classic zlib
jkotas Aug 19, 2024
7cf7435
Fix build breaks
jkotas Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/native/libs/System.IO.Compression.Native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 2 additions & 7 deletions src/native/libs/System.IO.Compression.Native/zlib_allocator_unix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
Loading