Merge pull request rust-lang#145 from oyvindln/link_collision_fix

Workaround to avoid having miniz_oxide_c_api export symbols that collide with miniz-sys
Byron · Jan 12, 2018 · 490a60a · 490a60a
2 parents 1e79297 + 3267727
commit 490a60a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ miniz-sys = { path = "miniz-sys", version = "0.1.7", optional = true }
 libz-sys = { version = "1.0", optional = true }
 tokio-io = { version = "0.1", optional = true }
 futures = { version = "0.1", optional = true }
-miniz_oxide_c_api = { version = "0.1", optional = true}
+miniz_oxide_c_api = { version = "0.1", optional = true, features = ["no_c_export"]}
 
 [dev-dependencies]
 rand = "0.3"