Commit 450d2756 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #359 from alexcrichton/nightly-fixes 

Fix nightly warnings about zero-sized fn pointers
parents 88ded2ce 3467cf34

openssl/src/ssl/mod.rs

+4 −2
Original line number Diff line number Diff line
@@ -569,7 +569,8 @@ impl SslContext { 
    pub fn set_servername_callback(&mut self, callback: Option<ServerNameCallback>) {

        unsafe {

            ffi::SSL_CTX_set_ex_data(self.ctx, SNI_IDX, mem::transmute(callback));

            let f: extern "C" fn() = mem::transmute(raw_sni);

            let f: extern "C" fn(_, _, _) -> _ = raw_sni;

            let f: extern "C" fn() = mem::transmute(f);

            ffi_extras::SSL_CTX_set_tlsext_servername_callback(self.ctx, Some(f));

        }

    }
@@ -586,7 +587,8 @@ impl SslContext { 
            ffi::SSL_CTX_set_ex_data(self.ctx, SNI_IDX, mem::transmute(Some(callback)));



            ffi_extras::SSL_CTX_set_tlsext_servername_arg(self.ctx, mem::transmute(data));

            let f: extern "C" fn() = mem::transmute(raw_sni_with_data::<T>);

            let f: extern "C" fn(_, _, _) -> _ = raw_sni_with_data::<T>;

            let f: extern "C" fn() = mem::transmute(f);

            ffi_extras::SSL_CTX_set_tlsext_servername_callback(self.ctx, Some(f));

        }

    }