aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/bio/mod.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-11-16 21:11:00 -0800
committerSteven Fackler <[email protected]>2015-11-16 21:11:00 -0800
commit094e8e5b3e6eef13b03fd8c5b67b4aaf81af5d5c (patch)
tree21e7a32e45992656ddefbf95c3179eb0f914b865 /openssl/src/bio/mod.rs
parentMerge branch 'release-v0.6.7' into release (diff)
parentRelease v0.7.0 (diff)
downloadrust-openssl-0.7.0.tar.xz
rust-openssl-0.7.0.zip
Merge branch 'release-v0.7.0' into releasev0.7.0
Diffstat (limited to 'openssl/src/bio/mod.rs')
-rw-r--r--openssl/src/bio/mod.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/openssl/src/bio/mod.rs b/openssl/src/bio/mod.rs
index 7eea16d8..a0c4b533 100644
--- a/openssl/src/bio/mod.rs
+++ b/openssl/src/bio/mod.rs
@@ -5,6 +5,7 @@ use std::ptr;
use std::cmp;
use ffi;
+use ffi_extras;
use ssl::error::{SslError};
pub struct MemBio {
@@ -60,7 +61,7 @@ impl MemBio {
/// Sets the BIO's EOF state.
pub fn set_eof(&self, eof: bool) {
let v = if eof { 0 } else { -1 };
- unsafe { ffi::BIO_set_mem_eof_return(self.bio, v); }
+ unsafe { ffi_extras::BIO_set_mem_eof_return(self.bio, v); }
}
}
@@ -72,7 +73,7 @@ impl Read for MemBio {
};
if ret <= 0 {
- let is_eof = unsafe { ffi::BIO_eof(self.bio) };
+ let is_eof = unsafe { ffi_extras::BIO_eof(self.bio) };
if is_eof != 0 {
Ok(0)
} else {