Unverified Commit 1f3d9879 authored by Steven Fackler's avatar Steven Fackler
Browse files

fixes

parent 528a3cc1

openssl-sys/build/main.rs

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ fn main() { 
    );

    println!("cargo:include={}", include_dir.to_string_lossy());



    let version = postprocess(&[include_dir.clone()]);

    let version = postprocess(&[include_dir]);



    let libs_env = env("OPENSSL_LIBS");

    let libs = match libs_env.as_ref().and_then(|s| s.to_str()) {
@@ -138,6 +138,7 @@ fn check_rustc_versions() { 
    }

}



#[allow(clippy::let_and_return)]

fn postprocess(include_dirs: &[PathBuf]) -> Version {

    let version = validate_headers(include_dirs);

    #[cfg(feature = "bindgen")]

openssl-sys/src/crypto.rs

+9 −1
Original line number Diff line number Diff line
@@ -11,6 +11,14 @@ cfg_if! { 
    }

}



cfg_if! {

    if #[cfg(ossl300)] {

        type CRYPTO_EX_dup_from_d = *mut *mut c_void;

    } else {

        type CRYPTO_EX_dup_from_d = *mut c_void;

    }

}



// FIXME should be options

pub type CRYPTO_EX_new = unsafe extern "C" fn(

    parent: *mut c_void,
@@ -23,7 +31,7 @@ pub type CRYPTO_EX_new = unsafe extern "C" fn( 
pub type CRYPTO_EX_dup = unsafe extern "C" fn(

    to: *mut CRYPTO_EX_DATA,

    from: CRYPTO_EX_dup_from,

    from_d: *mut c_void,

    from_d: CRYPTO_EX_dup_from_d,

    idx: c_int,

    argl: c_long,

    argp: *mut c_void,