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

Removed as_slice_with_nul as CString now derefs to a CStr

Browse source
This commit is contained in:
mitchmindtree 2015-02-22 01:17:47 +11:00
parent 0389c834e4
commit 1055eed078
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/android/mod.rs
View file

@ -313,7 +313,7 @@ impl Window {
pub fn get_proc_address(&self, addr: &str) -> *const () { pub fn get_proc_address(&self, addr: &str) -> *const () {
let addr = CString::from_slice(addr.as_bytes()); let addr = CString::from_slice(addr.as_bytes());
let addr = addr.as_bytes_with_nul().as_ptr(); let addr = addr.as_ptr();
unsafe { unsafe {
ffi::egl::GetProcAddress(addr) as *const () ffi::egl::GetProcAddress(addr) as *const ()
} }

2
src/win32/init.rs
View file

@ -171,7 +171,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
use libc; use libc;
let addr = CString::from_slice(addr.as_bytes()); let addr = CString::from_slice(addr.as_bytes());
let addr = addr.as_bytes_with_nul().as_ptr(); let addr = addr.as_ptr();
unsafe { unsafe {
gl::wgl::GetProcAddress(addr) as *const libc::c_void gl::wgl::GetProcAddress(addr) as *const libc::c_void

2
src/win32/mod.rs
View file

@ -192,7 +192,7 @@ impl Window {
/// See the docs in the crate root file. /// See the docs in the crate root file.
pub fn get_proc_address(&self, addr: &str) -> *const () { pub fn get_proc_address(&self, addr: &str) -> *const () {
let addr = CString::from_slice(addr.as_bytes()); let addr = CString::from_slice(addr.as_bytes());
let addr = addr.as_bytes_with_nul().as_ptr(); let addr = addr.as_ptr();
unsafe { unsafe {
let p = gl::wgl::GetProcAddress(addr) as *const (); let p = gl::wgl::GetProcAddress(addr) as *const ();

2
src/x11/headless.rs
View file

@ -8,7 +8,7 @@ use super::ffi;
fn with_c_str<F, T>(s: &str, f: F) -> T where F: FnOnce(*const libc::c_char) -> T { fn with_c_str<F, T>(s: &str, f: F) -> T where F: FnOnce(*const libc::c_char) -> T {
use std::ffi::CString; use std::ffi::CString;
let c_str = CString::from_slice(s.as_bytes()); let c_str = CString::from_slice(s.as_bytes());
f(c_str.as_bytes_with_nul().as_ptr()) f(c_str.as_ptr())
} }
pub struct HeadlessContext { pub struct HeadlessContext {

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

@ -39,7 +39,7 @@ fn ensure_thread_init() {
fn with_c_str<F, T>(s: &str, f: F) -> T where F: FnOnce(*const libc::c_char) -> T { fn with_c_str<F, T>(s: &str, f: F) -> T where F: FnOnce(*const libc::c_char) -> T {
use std::ffi::CString; use std::ffi::CString;
let c_str = CString::from_slice(s.as_bytes()); let c_str = CString::from_slice(s.as_bytes());
f(c_str.as_bytes_with_nul().as_ptr()) f(c_str.as_ptr())
} }
struct XWindow { struct XWindow {