From fda82fd6ed0b91cbd9f2b3c983ed70b8dd3a69c8 Mon Sep 17 00:00:00 2001 From: Kornel Date: Fri, 9 Apr 2021 12:53:36 +0100 Subject: [PATCH] Update cloudflare-zlib --- Cargo.toml | 2 +- src/ffi/c.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c9e28f9b..01035ad4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ libc = "0.2.65" cfg-if = "1.0.0" miniz-sys = { path = "miniz-sys", version = "0.1.11", optional = true } libz-sys = { version = "1.1.0", optional = true, default-features = false } -cloudflare-zlib-sys = { version = "0.2.0", optional = true } +cloudflare-zlib-sys = { version = "0.3.0", optional = true } tokio-io = { version = "0.1.11", optional = true } futures = { version = "0.1.25", optional = true } miniz_oxide = { version = "0.4.0", optional = true, default-features = false } diff --git a/src/ffi/c.rs b/src/ffi/c.rs index 9763eece..a2ba6d7f 100644 --- a/src/ffi/c.rs +++ b/src/ffi/c.rs @@ -38,13 +38,13 @@ impl Default for StreamWrapper { reserved: 0, opaque: ptr::null_mut(), state: ptr::null_mut(), - #[cfg(feature = "any_zlib")] + #[cfg(all(feature = "any_zlib", not(feature = "cloudflare-zlib-sys")))] zalloc, - #[cfg(feature = "any_zlib")] + #[cfg(all(feature = "any_zlib", not(feature = "cloudflare-zlib-sys")))] zfree, - #[cfg(not(feature = "any_zlib"))] + #[cfg(not(all(feature = "any_zlib", not(feature = "cloudflare-zlib-sys"))))] zalloc: Some(zalloc), - #[cfg(not(feature = "any_zlib"))] + #[cfg(not(all(feature = "any_zlib", not(feature = "cloudflare-zlib-sys"))))] zfree: Some(zfree), }), }