diff options
| author | Steven Fackler <[email protected]> | 2015-12-16 11:18:12 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-12-16 11:18:12 -0800 |
| commit | 39ea7e96362c60c6bd66dd453cbe7d534ecae9e2 (patch) | |
| tree | d98ea9359a5e66e9c79e2a9f8f4a00266b3ce230 | |
| parent | Rustfmt (diff) | |
| parent | Fix regression of c_char type mismatches on ARM (diff) | |
| download | rust-openssl-39ea7e96362c60c6bd66dd453cbe7d534ecae9e2.tar.xz rust-openssl-39ea7e96362c60c6bd66dd453cbe7d534ecae9e2.zip | |
Merge pull request #322 from operutka/master
Fix regression of c_char type mismatches on ARM
| -rw-r--r-- | openssl/src/ssl/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index 981b3bcd..183cf19d 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -951,7 +951,7 @@ impl Ssl { return None; } - unsafe { String::from_utf8(CStr::from_ptr(name).to_bytes().to_vec()).ok() } + unsafe { String::from_utf8(CStr::from_ptr(name as *const _).to_bytes().to_vec()).ok() } } /// change the context corresponding to the current connection |