aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2014-11-26 21:27:45 +0100
committertomaka <pierre.krieger1708@gmail.com>2014-11-26 21:27:45 +0100
commit749c47d8c20af078b06e8506b68a54e3799c1a8b (patch)
tree37bd2a35840823470b72c4d3ff03cecdfbab65a6
parent3ec343d12c16b19bc968404f8ccb04ae94d6425e (diff)
parent71d463f865a8ce4d4099807401d5e006ecc3dac9 (diff)
downloadglutin-749c47d8c20af078b06e8506b68a54e3799c1a8b.tar.gz
glutin-749c47d8c20af078b06e8506b68a54e3799c1a8b.zip
Merge pull request #143 from tomaka/update-rustc
Update for rustc
-rw-r--r--src/lib.rs2
-rw-r--r--src/x11/window/mod.rs2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/lib.rs b/src/lib.rs
index e389ff6..7a64e70 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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};