mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-24 22:31:30 +11:00
Merge pull request #215 from akiss77/pr-u8-c_char-upstream
`c_char` isn't always `i8`
This commit is contained in:
commit
862baf8220
|
@ -5,7 +5,7 @@ use libc;
|
|||
use std::{mem, ptr};
|
||||
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;
|
||||
let c_str = CString::from_slice(s.as_bytes());
|
||||
f(c_str.as_slice_with_nul().as_ptr())
|
||||
|
|
|
@ -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;
|
||||
let c_str = CString::from_slice(s.as_bytes());
|
||||
f(c_str.as_slice_with_nul().as_ptr())
|
||||
|
|
Loading…
Reference in a new issue