diff options
| author | Pierre Krieger <pierre.krieger1708@gmail.com> | 2015-01-03 23:11:59 +0100 |
|---|---|---|
| committer | Pierre Krieger <pierre.krieger1708@gmail.com> | 2015-01-03 23:15:39 +0100 |
| commit | 4c5e430dd3fcd38c29bfbc20dc0cc65defd33224 (patch) | |
| tree | 438ed8c0ce41fa513e92a4dd0696bf4114df38fa /src/x11 | |
| parent | ebe32bb2d803bc22c4b309acbbd48f3dc2a12127 (diff) | |
| download | glutin-4c5e430dd3fcd38c29bfbc20dc0cc65defd33224.tar.gz glutin-4c5e430dd3fcd38c29bfbc20dc0cc65defd33224.zip | |
Update for Rustc
Diffstat (limited to 'src/x11')
| -rw-r--r-- | src/x11/ffi.rs | 6 | ||||
| -rw-r--r-- | src/x11/window/mod.rs | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/x11/ffi.rs b/src/x11/ffi.rs index 5610eee..0528720 100644 --- a/src/x11/ffi.rs +++ b/src/x11/ffi.rs @@ -1241,7 +1241,7 @@ pub struct XSetWindowAttributes { #[repr(C)] pub struct XEvent { pub type_: libc::c_int, - pad: [libc::c_long, ..24], + pad: [libc::c_long; 24], } #[repr(C)] @@ -1253,7 +1253,7 @@ pub struct XClientMessageEvent { pub window: Window, pub message_type: Atom, pub format: libc::c_int, - pub l: [libc::c_long, ..5], + pub l: [libc::c_long; 5], } #[repr(C)] @@ -1435,7 +1435,7 @@ extern "C" { res_class: *mut libc::c_char) -> XIM; // TODO: this is a vararg function - //pub fn XCreateIC(im: XIM, ...) -> XIC; + //pub fn XCreateIC(im: XIM; .) -> XIC; pub fn XCreateIC(im: XIM, a: *const libc::c_char, b: libc::c_long, c: *const libc::c_char, d: Window, e: *const ()) -> XIC; pub fn XDestroyIC(ic: XIC); diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs index 768d480..1309fd4 100644 --- a/src/x11/window/mod.rs +++ b/src/x11/window/mod.rs @@ -57,7 +57,7 @@ impl Drop for XWindow { } } -#[deriving(Clone)] +#[derive(Clone)] pub struct WindowProxy { x: Arc<XWindow>, } @@ -302,6 +302,7 @@ impl Window { // loading the extra GLX functions let extra_functions = ffi::glx_extra::Glx::load_with(|addr| { + use std::c_str::ToCStr; addr.with_c_str(|s| { use libc; ffi::glx::GetProcAddress(s as *const u8) as *const libc::c_void @@ -355,6 +356,7 @@ impl Window { } pub fn set_title(&self, title: &str) { + use std::c_str::ToCStr; let c_title = title.to_c_str(); unsafe { ffi::XStoreName(self.x.display, self.x.window, c_title.as_ptr()); @@ -494,7 +496,7 @@ impl Window { let written = unsafe { use std::str; - let mut buffer: [u8, ..16] = [mem::uninitialized(), ..16]; + let mut buffer: [u8; 16] = [mem::uninitialized(); 16]; let raw_ev: *mut ffi::XKeyEvent = event; let count = ffi::Xutf8LookupString(self.x.ic, mem::transmute(raw_ev), mem::transmute(buffer.as_mut_ptr()), |