Merge pull request #651 from tomaka/fix-libc

Fix the libc breakage

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glutin"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["tomaka <pierre.krieger1708@gmail.com>"]
 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"

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

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 _);
             });
         }