diff options
| author | Steven Fackler <[email protected]> | 2014-04-23 23:01:29 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-04-23 23:03:51 -0700 |
| commit | 0c1e4194f51ad3ff20e1a52f8defbaec26efb64a (patch) | |
| tree | f4eae696abc45e06542e07cb5bd3a557e2943131 /ssl/ffi.rs | |
| parent | Merge pull request #8 from DiamondLovesYou/master (diff) | |
| download | rust-openssl-0c1e4194f51ad3ff20e1a52f8defbaec26efb64a.tar.xz rust-openssl-0c1e4194f51ad3ff20e1a52f8defbaec26efb64a.zip | |
Revert "Support the dynlock API"
This reverts commit af1a05678825e30a802ea09383658248d09d2dee.
This seems to cause Travis to segfault every once in a while. I've never
been able to reproduce the instability locally, so I'm just going to
pull this.
Diffstat (limited to 'ssl/ffi.rs')
| -rw-r--r-- | ssl/ffi.rs | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -101,14 +101,10 @@ pub static XN_FLAG_MULTILINE: c_ulong = 0x2a40006; #[link(name="crypto")] extern "C" { pub fn CRYPTO_num_locks() -> c_int; - pub fn CRYPTO_set_locking_callback( - func: extern fn(mode: c_int, n: c_int, file: *c_char, line: c_int)); - pub fn CRYPTO_set_dynlock_create_callback( - func: extern fn(file: *c_char, line: c_int) -> *c_void); - pub fn CRYPTO_set_dynlock_lock_callback( - func: extern fn(mode: c_int, l: *c_void, file: *c_char, line: c_int)); - pub fn CRYPTO_set_dynlock_destroy_callback( - func: extern fn(l: *c_void, file: *c_char, line: c_int)); + pub fn CRYPTO_set_locking_callback(func: extern "C" fn(mode: c_int, + n: c_int, + file: *c_char, + line: c_int)); pub fn ERR_get_error() -> c_ulong; |