min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #105 from andor44/master 

Sync is now part of the standard library
This commit is contained in:
Steven Fackler 2014-11-26 08:45:47 -08:00
parent 525394d308 762331eb2b
commit ccb134e320
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openssl-sys/src/lib.rs
View File

@ -3,13 +3,12 @@
extern crate libc; extern crate libc;
extern crate rustrt; extern crate rustrt;
extern crate sync;
use libc::{c_void, c_int, c_char, c_ulong, c_long, c_uint, c_uchar, size_t}; use libc::{c_void, c_int, c_char, c_ulong, c_long, c_uint, c_uchar, size_t};
use std::mem; use std::mem;
use std::ptr; use std::ptr;
use rustrt::mutex::NativeMutex; use rustrt::mutex::NativeMutex;
use sync::one::{Once, ONCE_INIT}; use std::sync::{Once, ONCE_INIT};
pub type ASN1_INTEGER = c_void; pub type ASN1_INTEGER = c_void;
pub type ASN1_STRING = c_void; pub type ASN1_STRING = c_void;

1
src/lib.rs
View File

@ -7,7 +7,6 @@
extern crate libc; extern crate libc;
#[cfg(test)] #[cfg(test)]
extern crate serialize; extern crate serialize;
extern crate sync;
extern crate "openssl-sys" as ffi; extern crate "openssl-sys" as ffi;

2
src/ssl/mod.rs
View File

@ -2,7 +2,7 @@ use libc::{c_int, c_void, c_long};
use std::io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer}; use std::io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer};
use std::mem; use std::mem;
use std::ptr; use std::ptr;
use sync::one::{Once, ONCE_INIT}; use std::sync::{Once, ONCE_INIT};
use bio::{MemBio}; use bio::{MemBio};
use ffi; use ffi;