aboutsummaryrefslogtreecommitdiffstats
path: root/src/x11/window/mod.rs
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2014-10-22 11:28:10 +0200
committertomaka <pierre.krieger1708@gmail.com>2014-10-22 11:28:10 +0200
commit2a29e4d743205e96da611516f5fe99da78e462d1 (patch)
tree0c44986d2c2db6a27dee94a3a9c9d6a8385ec9c6 /src/x11/window/mod.rs
parentc8ea2bf587429b5b59d5a41f7ebb16a7998badd9 (diff)
parent2ff393fe623d10f2ea89262013ba66e228cc0c94 (diff)
downloadglutin-2a29e4d743205e96da611516f5fe99da78e462d1.tar.gz
glutin-2a29e4d743205e96da611516f5fe99da78e462d1.zip
Merge pull request #59 from tomaka/update
Update for rustc and gl-rs
Diffstat (limited to 'src/x11/window/mod.rs')
-rw-r--r--src/x11/window/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs
index ad10e16..cb73958 100644
--- a/src/x11/window/mod.rs
+++ b/src/x11/window/mod.rs
@@ -1,7 +1,7 @@
use {Event, WindowBuilder};
use libc;
use std::{mem, ptr};
-use std::sync::atomics::AtomicBool;
+use std::sync::atomic::AtomicBool;
use super::ffi;
pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor};
@@ -260,7 +260,7 @@ impl Window {
}
pub fn is_closed(&self) -> bool {
- use std::sync::atomics::Relaxed;
+ use std::sync::atomic::Relaxed;
self.is_closed.load(Relaxed)
}
@@ -340,7 +340,7 @@ impl Window {
ffi::ClientMessage => {
use Closed;
- use std::sync::atomics::Relaxed;
+ use std::sync::atomic::Relaxed;
let client_msg: &ffi::XClientMessageEvent = unsafe { mem::transmute(&xev) };