From 6a725acf4ddb949dbc3b1365ebc340b5066bebad Mon Sep 17 00:00:00 2001
From: Jethro Beekman <jethro@jbeekman.nl>
Date: Mon, 22 Jun 2015 22:28:07 -0700
Subject: [PATCH] Remove #ifs for same-value shimmed SSL options. Depend on
 compiler optimization instead.

---
 openssl-sys/build.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs
index 841c7eec9..b4a005666 100644
--- a/openssl-sys/build.rs
+++ b/openssl-sys/build.rs
@@ -101,9 +101,7 @@ fn generate_options_shim() -> PathBuf {
     writeln!(shim,"long rust_openssl_ssl_ctx_options_rust_to_c(uint64_t rustval) {{").unwrap();
     writeln!(shim,"    long cval=rustval&COPY_MASK;").unwrap();
     for &(name,_) in options {
-        writeln!(shim,"#if RUST_{0}!={0}",name).unwrap();
         writeln!(shim,"    if (rustval&RUST_{0}) cval|={0};",name).unwrap();
-        writeln!(shim,"#endif").unwrap();
     }
     writeln!(shim,"    return cval;").unwrap();
     writeln!(shim,"}}").unwrap();
@@ -111,9 +109,7 @@ fn generate_options_shim() -> PathBuf {
     writeln!(shim,"uint64_t rust_openssl_ssl_ctx_options_c_to_rust(long cval) {{").unwrap();
     writeln!(shim,"    uint64_t rustval=cval&COPY_MASK;").unwrap();
     for &(name,_) in options {
-        writeln!(shim,"#if RUST_{0}!={0}",name).unwrap();
         writeln!(shim,"    if (cval&{0}) rustval|=RUST_{0};",name).unwrap();
-        writeln!(shim,"#endif").unwrap();
     }
     writeln!(shim,"    return rustval;").unwrap();
     writeln!(shim,"}}").unwrap();
-- 
GitLab