Merge pull request #59 from tomaka/update

Update for rustc and gl-rs

2 files changed, 18 insertions, 5 deletions

diff --git a/src/x11/ffi.rs b/src/x11/ffi.rs
index 39a6ae5..822f755 100644
--- a/src/x11/ffi.rs
+++ b/src/x11/ffi.rs
@@ -8,12 +8,25 @@ use libc;
 
 /// GLX bindings
 pub mod glx {
-    generate_gl_bindings!("glx", "core", "1.4", "static")
+    generate_gl_bindings! {
+        api: "glx",
+        profile: "core",
+        version: "1.4",
+        generator: "static"
+    }
 }
 
 /// Functions that are not necessarly always available
 pub mod glx_extra {
-    generate_gl_bindings!("glx", "core", "1.4", "struct", [ "GLX_ARB_create_context" ])
+    generate_gl_bindings! {
+        api: "glx",
+        profile: "core",
+        version: "1.4",
+        generator: "struct",
+        extensions: [
+            "GLX_ARB_create_context"
+        ]
+    }
 }
 
 pub type Atom = libc::c_ulong;
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) };