migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-31 13:50:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

c_char isn't always i8

Browse Source
This commit is contained in:
Akos Kiss
2015-01-20 17:09:13 +00:00
parent 4d12d3ea3d
commit 935e5a36a2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/x11/headless.rs
View File

@@ -5,7 +5,7 @@ use libc;
use std::{mem, ptr}; use std::{mem, ptr};
use super::ffi; use super::ffi;
fn with_c_str<F, T>(s: &str, f: F) -> T where F: FnOnce(*const i8) -> 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_slice_with_nul().as_ptr()) f(c_str.as_slice_with_nul().as_ptr())

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

@@ -24,7 +24,7 @@ fn ensure_thread_init() {
}); });
} }
fn with_c_str<F, T>(s: &str, f: F) -> T where F: FnOnce(*const i8) -> 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_slice_with_nul().as_ptr()) f(c_str.as_slice_with_nul().as_ptr())