diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 09:19:00 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 09:19:00 -0800 |
| commit | 009ec5d2b0c4ab0e7dc7ab2f6b15754b4da14caf (patch) | |
| tree | 8b441fd58860857f2e7bf5eabbf2226b92bf13c7 /src/libstd/sys/windows | |
| parent | 0101bbe7acb38e8113c0cafeb7d5ae0be6448e5b (diff) | |
| parent | f3a7ec7028c76b3a1c6051131328f372b068e33a (diff) | |
| download | rust-009ec5d2b0c4ab0e7dc7ab2f6b15754b4da14caf.tar.gz rust-009ec5d2b0c4ab0e7dc7ab2f6b15754b4da14caf.zip | |
rollup merge of #20315: alexcrichton/std-sync
Conflicts: src/libstd/rt/exclusive.rs src/libstd/sync/barrier.rs src/libstd/sys/unix/pipe.rs src/test/bench/shootout-binarytrees.rs src/test/bench/shootout-fannkuch-redux.rs
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/mutex.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs index c354e7b3ece..d625e63952a 100644 --- a/src/libstd/sys/windows/mod.rs +++ b/src/libstd/sys/windows/mod.rs @@ -173,7 +173,7 @@ pub fn init_net() { unsafe { static START: Once = ONCE_INIT; - START.doit(|| { + START.call_once(|| { let mut data: c::WSADATA = mem::zeroed(); let ret = c::WSAStartup(0x202, // version 2.2 &mut data); diff --git a/src/libstd/sys/windows/mutex.rs b/src/libstd/sys/windows/mutex.rs index c7b4a4cec09..e0fa02b5599 100644 --- a/src/libstd/sys/windows/mutex.rs +++ b/src/libstd/sys/windows/mutex.rs @@ -20,7 +20,7 @@ const SPIN_COUNT: DWORD = 4000; pub struct Mutex { inner: atomic::AtomicUint } -pub const MUTEX_INIT: Mutex = Mutex { inner: atomic::INIT_ATOMIC_UINT }; +pub const MUTEX_INIT: Mutex = Mutex { inner: atomic::ATOMIC_UINT_INIT }; unsafe impl Sync for Mutex {} |