Merge pull request #653 from Daggerbot/pr

Change some uses of c_void to avoid libc version conflicts.
This commit is contained in:
tomaka 2015-11-05 07:59:19 +01:00
commit 0386d093d1

View file

@ -354,8 +354,8 @@ impl Window {
Glx(::api::glx::ContextPrototype<'a>), Glx(::api::glx::ContextPrototype<'a>),
Egl(::api::egl::ContextPrototype<'a>), Egl(::api::egl::ContextPrototype<'a>),
} }
let builder_clone_opengl_glx = 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 builder_clone_opengl_egl = opengl.clone().map_sharing(|_| unimplemented!()); // FIXME:
let context = match opengl.version { let context = match opengl.version {
GlRequest::Latest | GlRequest::Specific(Api::OpenGl, _) | GlRequest::GlThenGles { .. } => { GlRequest::Latest | GlRequest::Specific(Api::OpenGl, _) | GlRequest::GlThenGles { .. } => {
// GLX should be preferred over EGL, otherwise crashes may occur // GLX should be preferred over EGL, otherwise crashes may occur