diff options
author | tomaka <pierre.krieger1708@gmail.com> | 2015-11-04 18:26:58 +0100 |
---|---|---|
committer | tomaka <pierre.krieger1708@gmail.com> | 2015-11-04 18:26:58 +0100 |
commit | 3b5fe6ad998077eebd46ecb9376b153b0abb6d58 (patch) | |
tree | 4b42dc0d0a5d2e8138443c7a622f1e8c26bcad89 /src | |
parent | 188b8f5c081011e6a2dfe7b0ff9d72e7a0bb2566 (diff) | |
parent | 2fcbdcc2fc71e63aba50d752c53eb266799cf4ec (diff) | |
download | glutin-3b5fe6ad998077eebd46ecb9376b153b0abb6d58.tar.gz glutin-3b5fe6ad998077eebd46ecb9376b153b0abb6d58.zip |
Merge pull request #651 from tomaka/fix-libc
Fix the libc breakage
Diffstat (limited to 'src')
-rw-r--r-- | src/api/osmesa/mod.rs | 2 | ||||
-rw-r--r-- | src/api/x11/window.rs | 2 |
2 files changed, 2 insertions, 2 deletions
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 _); }); } |