alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 22:31:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix the libc breakage

Browse source
This commit is contained in:
Pierre Krieger 2015-11-04 11:22:44 +01:00
parent 188b8f5c08
commit 2fcbdcc2fc
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "glutin" name = "glutin"
version = "0.4.0" version = "0.4.1"
authors = ["tomaka <pierre.krieger1708@gmail.com>"] authors = ["tomaka <pierre.krieger1708@gmail.com>"]
description = "Cross-plaform OpenGL context provider." description = "Cross-plaform OpenGL context provider."
keywords = ["windowing", "opengl"] keywords = ["windowing", "opengl"]
@ -21,7 +21,7 @@ gl_generator = "0.1.0"
khronos_api = "0.0.8" khronos_api = "0.0.8"
[dev-dependencies] [dev-dependencies]
clock_ticks = "0.0.5" clock_ticks = "0.1.0"
[target.arm-linux-androideabi.dependencies.android_glue] [target.arm-linux-androideabi.dependencies.android_glue]
version = "0.1" version = "0.1"

2
src/api/osmesa/mod.rs
View file

@ -89,7 +89,7 @@ impl GlContext for OsMesaContext {
#[inline] #[inline]
unsafe fn make_current(&self) -> Result<(), ContextError> { unsafe fn make_current(&self) -> Result<(), ContextError> {
let ret = osmesa_sys::OSMesaMakeCurrent(self.context, self.buffer.as_ptr() 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); 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 // an error can only happen in case of invalid parameter, which would indicate a bug

2
src/api/x11/window.rs
View file

@ -521,7 +521,7 @@ impl Window {
(*hint).res_name = c_name as *mut libc::c_char; (*hint).res_name = c_name as *mut libc::c_char;
(*hint).res_class = 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.XSetClassHint)(display.display, window, hint);
(display.xlib.XFree)(hint as *mut libc::c_void); (display.xlib.XFree)(hint as *mut _);
}); });
} }