From 2fcbdcc2fc71e63aba50d752c53eb266799cf4ec Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 4 Nov 2015 11:22:44 +0100 Subject: [PATCH] Fix the libc breakage --- Cargo.toml | 4 ++-- src/api/osmesa/mod.rs | 2 +- src/api/x11/window.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dacef718..5cccfe18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glutin" -version = "0.4.0" +version = "0.4.1" authors = ["tomaka "] description = "Cross-plaform OpenGL context provider." keywords = ["windowing", "opengl"] @@ -21,7 +21,7 @@ gl_generator = "0.1.0" khronos_api = "0.0.8" [dev-dependencies] -clock_ticks = "0.0.5" +clock_ticks = "0.1.0" [target.arm-linux-androideabi.dependencies.android_glue] version = "0.1" diff --git a/src/api/osmesa/mod.rs b/src/api/osmesa/mod.rs index c41c9977..065ffc68 100644 --- a/src/api/osmesa/mod.rs +++ b/src/api/osmesa/mod.rs @@ -89,7 +89,7 @@ impl GlContext for OsMesaContext { #[inline] unsafe fn make_current(&self) -> Result<(), ContextError> { let ret = osmesa_sys::OSMesaMakeCurrent(self.context, self.buffer.as_ptr() - as *mut libc::c_void, 0x1401, self.width + as *mut _, 0x1401, self.width as libc::c_int, self.height as libc::c_int); // an error can only happen in case of invalid parameter, which would indicate a bug diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs index 0196f672..16524838 100644 --- a/src/api/x11/window.rs +++ b/src/api/x11/window.rs @@ -521,7 +521,7 @@ impl Window { (*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); + (display.xlib.XFree)(hint as *mut _); }); }