fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 14:25:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge #1031

Browse Source 
1031: Improve portability of code by using c_char r=MarkMcCaskey a=MarkMcCaskey

This PR makes emscripten compile on ARM with an up to date nightly compiler

Co-authored-by: Mark McCaskey <mark@wasmer.io>
This commit is contained in:
bors[bot] 2019-12-02 20:00:08 +00:00 committed by GitHub
commit 652433eb61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/emscripten/src/syscalls/unix.rs
View File

@ -7,6 +7,7 @@ use libc::{
accept,
access,
bind,
c_char,
c_int,
c_ulong,
c_void,
@ -1063,14 +1064,14 @@ pub fn ___syscall220(ctx: &mut Ctx, _which: i32, mut varargs: VarArgs) -> i32 {
let upper_bound = std::cmp::min((*dirent).d_reclen, 255) as usize;
let mut i = 0;
while i < upper_bound {
*(dirp.add(pos + 11 + i) as *mut i8) = (*dirent).d_name[i] as _;
*(dirp.add(pos + 11 + i) as *mut c_char) = (*dirent).d_name[i] as c_char;
i += 1;
}
// We set the termination string char
*(dirp.add(pos + 11 + i) as *mut i8) = 0 as i8;
*(dirp.add(pos + 11 + i) as *mut c_char) = 0 as c_char;
debug!(
" => file {}",
CStr::from_ptr(dirp.add(pos + 11) as *const i8)
CStr::from_ptr(dirp.add(pos + 11) as *const c_char)
.to_str()
.unwrap()
);