diff options
author | andy finch <andyfinch7@gmail.com> | 2019-02-26 03:56:19 -0500 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2019-02-26 03:56:19 -0500 |
commit | 9ed413b318def875df134dddc1d0fee00a75913a (patch) | |
tree | cd1297004e5d09aa449aeaba998b49bee6322216 /src | |
parent | d426d78ae71dd69d77d7354b515762fc7e0b8a4b (diff) |
Updated some type assertions to work with other libc implementations. (#1837)
Diffstat (limited to 'src')
-rw-r--r-- | src/flags.rs | 5 | ||||
-rw-r--r-- | src/isolate.rs | 4 |
2 files changed, 5 insertions, 4 deletions
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<String>) -> Vec<String> { .collect::<Vec<_>>(); 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::<Vec<_>>(); // 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<String>) -> Vec<String> { 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<libdeno::deno_mod, JSError> { 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) |