diff options
author | tomaka <pierre.krieger1708@gmail.com> | 2014-11-26 21:27:45 +0100 |
---|---|---|
committer | tomaka <pierre.krieger1708@gmail.com> | 2014-11-26 21:27:45 +0100 |
commit | 749c47d8c20af078b06e8506b68a54e3799c1a8b (patch) | |
tree | 37bd2a35840823470b72c4d3ff03cecdfbab65a6 | |
parent | 3ec343d12c16b19bc968404f8ccb04ae94d6425e (diff) | |
parent | 71d463f865a8ce4d4099807401d5e006ecc3dac9 (diff) | |
download | glutin-749c47d8c20af078b06e8506b68a54e3799c1a8b.tar.gz glutin-749c47d8c20af078b06e8506b68a54e3799c1a8b.zip |
Merge pull request #143 from tomaka/update-rustc
Update for rustc
-rw-r--r-- | src/lib.rs | 2 | ||||
-rw-r--r-- | src/x11/window/mod.rs | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -42,8 +42,6 @@ extern crate cocoa; extern crate core_foundation; #[cfg(target_os = "macos")] extern crate core_graphics; -#[cfg(target_os = "linux")] -extern crate sync; pub use events::*; diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs index 668cd03..8662fdc 100644 --- a/src/x11/window/mod.rs +++ b/src/x11/window/mod.rs @@ -6,7 +6,7 @@ use std::{mem, ptr}; use std::cell::Cell; use std::sync::atomic::AtomicBool; use super::ffi; -use sync::one::{Once, ONCE_INIT}; +use std::sync::{Once, ONCE_INIT}; pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor}; |