From c06cf52e887cc560f1fd4fa72713b239fe0102a6 Mon Sep 17 00:00:00 2001 From: MatthieuCoder Date: Sat, 14 Jan 2023 21:59:48 +0400 Subject: [PATCH] fix pointer sizes --- exes/all-in-one/src/errors.rs | 2 +- exes/all-in-one/src/ffi.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exes/all-in-one/src/errors.rs b/exes/all-in-one/src/errors.rs index 1d2a9e2..d2c7444 100644 --- a/exes/all-in-one/src/errors.rs +++ b/exes/all-in-one/src/errors.rs @@ -40,7 +40,7 @@ pub fn handle_error(error: &anyhow::Error) { unsafe { func( (stacktrace.len() + 1).try_into().unwrap(), - stacktrace.as_mut_ptr().cast::(), + stacktrace.as_mut_ptr().cast::(), ); } } diff --git a/exes/all-in-one/src/ffi.rs b/exes/all-in-one/src/ffi.rs index 449d1cc..b4c853d 100644 --- a/exes/all-in-one/src/ffi.rs +++ b/exes/all-in-one/src/ffi.rs @@ -40,7 +40,7 @@ pub extern "C" fn load_config() -> *mut c_char { let c_str_song = CString::new(config)?; Ok(c_str_song.into_raw()) }) - .or(Some(ptr::null::() as *mut i8)) + .or(Some(ptr::null::() as *mut c_char)) .expect("something has gone terribly wrong") } @@ -138,6 +138,6 @@ pub unsafe extern "C" fn create_instance(config: *mut c_char) -> *mut AllInOneIn Ok(all_in_one) }) - .or(Some(ptr::null::() as *mut AllInOneInstance)) + .or(Some(ptr::null::() as *mut AllInOneInstance)) .expect("something has gone terribly wrong") } -- 2.39.5