From 9ed413b318def875df134dddc1d0fee00a75913a Mon Sep 17 00:00:00 2001 From: andy finch Date: Tue, 26 Feb 2019 03:56:19 -0500 Subject: Updated some type assertions to work with other libc implementations. (#1837) --- src/flags.rs | 5 +++-- src/isolate.rs | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/flags.rs b/src/flags.rs index a680c8aa1..5f6492c46 100644 --- a/src/flags.rs +++ b/src/flags.rs @@ -3,6 +3,7 @@ use crate::libdeno; use getopts; use getopts::Options; +use libc::c_char; use libc::c_int; use std::ffi::CStr; use std::ffi::CString; @@ -343,7 +344,7 @@ pub fn v8_set_flags(args: Vec) -> Vec { .collect::>(); let mut c_argv = raw_argv .iter_mut() - .map(|arg| arg.as_mut_ptr() as *mut i8) + .map(|arg| arg.as_mut_ptr() as *mut c_char) .collect::>(); // Store the length of the c_argv array in a local variable. We'll pass @@ -360,7 +361,7 @@ pub fn v8_set_flags(args: Vec) -> Vec { c_argv .iter() .map(|ptr| unsafe { - let cstr = CStr::from_ptr(*ptr as *const i8); + let cstr = CStr::from_ptr(*ptr as *const c_char); let slice = cstr.to_str().unwrap(); slice.to_string() }).chain(rest.into_iter()) diff --git a/src/isolate.rs b/src/isolate.rs index 661e49edd..63f45b5df 100644 --- a/src/isolate.rs +++ b/src/isolate.rs @@ -287,10 +287,10 @@ impl Isolate { source: String, ) -> Result { let name_ = CString::new(name.clone()).unwrap(); - let name_ptr = name_.as_ptr() as *const i8; + let name_ptr = name_.as_ptr() as *const c_char; let source_ = CString::new(source.clone()).unwrap(); - let source_ptr = source_.as_ptr() as *const i8; + let source_ptr = source_.as_ptr() as *const c_char; let id = unsafe { libdeno::deno_mod_new(self.libdeno_isolate, name_ptr, source_ptr) -- cgit v1.2.3