aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Krieger <pierre.krieger1708@gmail.com>2015-11-04 11:22:44 +0100
committerPierre Krieger <pierre.krieger1708@gmail.com>2015-11-04 11:28:08 +0100
commit2fcbdcc2fc71e63aba50d752c53eb266799cf4ec (patch)
tree4b42dc0d0a5d2e8138443c7a622f1e8c26bcad89
parent188b8f5c081011e6a2dfe7b0ff9d72e7a0bb2566 (diff)
downloadglutin-2fcbdcc2fc71e63aba50d752c53eb266799cf4ec.tar.gz
glutin-2fcbdcc2fc71e63aba50d752c53eb266799cf4ec.zip
Fix the libc breakage
-rw-r--r--Cargo.toml4
-rw-r--r--src/api/osmesa/mod.rs2
-rw-r--r--src/api/x11/window.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/Cargo.toml b/Cargo.toml
index dacef71..5cccfe1 100644
--- a/Cargo.toml
+++ b/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"
diff --git a/src/api/osmesa/mod.rs b/src/api/osmesa/mod.rs
index c41c997..065ffc6 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 0196f67..1652483 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 _);
});
}