diff options
| author | Daggerbot <daggerbot@gmail.com> | 2015-11-04 08:21:42 -0800 |
|---|---|---|
| committer | Daggerbot <daggerbot@gmail.com> | 2015-11-04 08:21:42 -0800 |
| commit | 7e4f795a53aee93add100f74f4b84bf24b04848a (patch) | |
| tree | 8f0d242869193064b2737776502e25f1549a9804 /src/api/x11 | |
| parent | 188b8f5c081011e6a2dfe7b0ff9d72e7a0bb2566 (diff) | |
| download | glutin-7e4f795a53aee93add100f74f4b84bf24b04848a.tar.gz glutin-7e4f795a53aee93add100f74f4b84bf24b04848a.zip | |
Change some uses of c_void to avoid libc version conflicts.
Diffstat (limited to 'src/api/x11')
| -rw-r--r-- | src/api/x11/window.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs index 0196f67..72b9b33 100644 --- a/src/api/x11/window.rs +++ b/src/api/x11/window.rs @@ -354,8 +354,8 @@ impl Window { Glx(::api::glx::ContextPrototype<'a>), Egl(::api::egl::ContextPrototype<'a>), } - let builder_clone_opengl_glx = opengl.clone().map_sharing(|_| unimplemented!()); // FIXME: - let builder_clone_opengl_egl = opengl.clone().map_sharing(|_| unimplemented!()); // FIXME: + let builder_clone_opengl_glx = opengl.clone().map_sharing(|_| unimplemented!()); // FIXME: + let builder_clone_opengl_egl = opengl.clone().map_sharing(|_| unimplemented!()); // FIXME: let context = match opengl.version { GlRequest::Latest | GlRequest::Specific(Api::OpenGl, _) | GlRequest::GlThenGles { .. } => { // GLX should be preferred over EGL, otherwise crashes may occur @@ -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 _); }); } |