diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/api/glx/mod.rs | 7 | ||||
| -rw-r--r-- | src/platform/linux/api_dispatch.rs | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/api/glx/mod.rs b/src/api/glx/mod.rs index d3f28ed..95b6f99 100644 --- a/src/api/glx/mod.rs +++ b/src/api/glx/mod.rs @@ -415,10 +415,9 @@ unsafe fn choose_fbconfig(glx: &ffi::glx::Glx, extensions: &str, xlib: &ffi::Xli out.push(stencil as c_int); } - if let Some(double_buffer) = reqs.double_buffer { - out.push(ffi::glx::DOUBLEBUFFER as c_int); - out.push(if double_buffer { 1 } else { 0 }); - } + let double_buffer = reqs.double_buffer.unwrap_or(true); + out.push(ffi::glx::DOUBLEBUFFER as c_int); + out.push(if double_buffer { 1 } else { 0 }); if let Some(multisampling) = reqs.multisampling { if extensions.split(' ').find(|&i| i == "GLX_ARB_multisample").is_some() { diff --git a/src/platform/linux/api_dispatch.rs b/src/platform/linux/api_dispatch.rs index 8bf0ae5..2373770 100644 --- a/src/platform/linux/api_dispatch.rs +++ b/src/platform/linux/api_dispatch.rs @@ -399,8 +399,8 @@ unsafe extern "C" fn x_error_callback(dpy: *mut x11::ffi::Display, event: *mut x if let Backend::X(ref x) = *BACKEND { let mut buff: Vec<u8> = Vec::with_capacity(1024); - (x.xlib.XGetErrorText)(dpy, (*event).error_code as i32, buff.as_mut_ptr() as *mut i8, buff.capacity() as i32); - let description = CStr::from_ptr(buff.as_mut_ptr() as *const i8).to_string_lossy(); + (x.xlib.XGetErrorText)(dpy, (*event).error_code as i32, buff.as_mut_ptr() as *mut libc::c_char, buff.capacity() as i32); + let description = CStr::from_ptr(buff.as_mut_ptr() as *const libc::c_char).to_string_lossy(); let error = XError { description: description.into_owned(), |