Commit ccb134e3 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #105 from andor44/master 

Sync is now part of the standard library
parents 525394d3 762331eb

openssl-sys/src/lib.rs

+1 −2
Original line number Diff line number Diff line
@@ -3,13 +3,12 @@ 


extern crate libc;

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 std::mem;

use std::ptr;

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_STRING = c_void;

src/lib.rs

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
extern crate libc;

#[cfg(test)]

extern crate serialize;

extern crate sync;



extern crate "openssl-sys" as ffi;

src/ssl/mod.rs

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ use libc::{c_int, c_void, c_long}; 
use std::io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer};

use std::mem;

use std::ptr;

use sync::one::{Once, ONCE_INIT};

use std::sync::{Once, ONCE_INIT};



use bio::{MemBio};

use ffi;