aboutsummaryrefslogtreecommitdiff
path: root/src/ffi.rs
diff options
context:
space:
mode:
authorD.K <[email protected]>2014-10-02 14:42:28 -0400
committerSteven Fackler <[email protected]>2014-10-04 19:40:34 -0700
commit09ecc7e521bd3003a4449fb8e234c3525ec81dee (patch)
treecab3b810cd126df22269c75b98ab9c9fb10f020d /src/ffi.rs
parentMerge pull request #64 from reem/fix/big-num-is-zero (diff)
downloadrust-openssl-09ecc7e521bd3003a4449fb8e234c3525ec81dee.tar.xz
rust-openssl-09ecc7e521bd3003a4449fb8e234c3525ec81dee.zip
Changes made to support 0.12.0-dev ( October 2, 2014 )
Diffstat (limited to 'src/ffi.rs')
-rw-r--r--src/ffi.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ffi.rs b/src/ffi.rs
index 7bfaf25d..63a13335 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -171,14 +171,12 @@ pub static X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE: c_int = 45;
pub static X509_V_ERR_UNSUPPORTED_NAME_SYNTAX: c_int = 53;
pub static X509_V_OK: c_int = 0;
-#[cfg(target_os = "macos", feature = "tlsv1_1")]
-#[cfg(target_os = "macos", feature = "tlsv1_2")]
+#[cfg( any( all(target_os = "macos", feature = "tlsv1_1"),all(target_os = "macos", feature = "tlsv1_2")))]
#[link(name="ssl.1.0.0")]
#[link(name="crypto.1.0.0")]
extern {}
-#[cfg(not(target_os = "macos"))]
-#[cfg(target_os = "macos", not(feature = "tlsv1_1"), not(feature = "tlsv1_2"))]
+#[cfg(any( not( target_os = "macos"), all(target_os = "macos", not(feature = "tlsv1_1"), not(feature = "tlsv1_2"))))]
#[link(name="ssl")]
#[link(name="crypto")]
extern {}