From 07c8154cb7f7f0f9387e64ddccd8705c048b35d8 Mon Sep 17 00:00:00 2001 From: Akos Kiss Date: Wed, 22 Jul 2015 21:18:50 +0000 Subject: [PATCH] Add aarch64-unknown-linux-gnu support * Adding dependencies * Replacing `i8` with `c_char` ot `_` (since `c_char` can be unsigned on some platforms, aarch64 is one of them) --- Cargo.toml | 6 ++++++ examples/support/mod.rs | 2 +- src/api/x11/window.rs | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1faf2519..7f30a3fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -90,3 +90,9 @@ osmesa-sys = "0.0.5" wayland-client = { version = "0.2.0", features = ["egl", "dlopen"] } wayland-kbd = "0.2.0" x11-dl = "~2.0" + +[target.aarch64-unknown-linux-gnu.dependencies] +osmesa-sys = "0.0.5" +wayland-client = { version = "0.2.0", features = ["egl", "dlopen"] } +wayland-kbd = "0.2.0" +x11-dl = "~2.0" diff --git a/examples/support/mod.rs b/examples/support/mod.rs index ac41239c..01eeb7bc 100644 --- a/examples/support/mod.rs +++ b/examples/support/mod.rs @@ -22,7 +22,7 @@ pub fn load(window: &glutin::Window) -> Context { let gl = gl::Gl::load(window); let version = unsafe { - let data = CStr::from_ptr(gl.GetString(gl::VERSION) as *const i8).to_bytes().to_vec(); + let data = CStr::from_ptr(gl.GetString(gl::VERSION) as *const _).to_bytes().to_vec(); String::from_utf8(data).unwrap() }; diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs index 6a4f39ae..35b6a84b 100644 --- a/src/api/x11/window.rs +++ b/src/api/x11/window.rs @@ -492,8 +492,8 @@ impl Window { unsafe { with_c_str(&*builder.title, |c_name| { let hint = (display.xlib.XAllocClassHint)(); - (*hint).res_name = c_name as *mut i8; - (*hint).res_class = c_name as *mut i8; + (*hint).res_name = c_name as *mut libc::c_char; + (*hint).res_class = c_name as *mut libc::c_char; (display.xlib.XSetClassHint)(display.display, window, hint); (display.xlib.XFree)(hint as *mut libc::c_void); });