diff options
| author | Steven Fackler <[email protected]> | 2016-03-11 13:14:38 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-03-11 13:14:38 -0800 |
| commit | 450d27564842cde25f19fe37fee1862ee3d6699b (patch) | |
| tree | 53b720b9c162e7dd17de4c4493d2d0bc21a4d363 /openssl/src | |
| parent | Merge pull request #285 from winding-lines/patch-1 (diff) | |
| parent | Fix nightly warnings about zero-sized fn pointers (diff) | |
| download | rust-openssl-450d27564842cde25f19fe37fee1862ee3d6699b.tar.xz rust-openssl-450d27564842cde25f19fe37fee1862ee3d6699b.zip | |
Merge pull request #359 from alexcrichton/nightly-fixes
Fix nightly warnings about zero-sized fn pointers
Diffstat (limited to 'openssl/src')
| -rw-r--r-- | openssl/src/ssl/mod.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index b4c73479..574a324b 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -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)); } } |