Skip to content

Commit 652433e

Browse files
bors[bot]Mark McCaskey
and
Mark McCaskey
authored
Merge #1031
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 <[email protected]>
2 parents d639748 + 5234897 commit 652433e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lib/emscripten/src/syscalls/unix.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use libc::{
77
accept,
88
access,
99
bind,
10+
c_char,
1011
c_int,
1112
c_ulong,
1213
c_void,
@@ -1063,14 +1064,14 @@ pub fn ___syscall220(ctx: &mut Ctx, _which: i32, mut varargs: VarArgs) -> i32 {
10631064
let upper_bound = std::cmp::min((*dirent).d_reclen, 255) as usize;
10641065
let mut i = 0;
10651066
while i < upper_bound {
1066-
*(dirp.add(pos + 11 + i) as *mut i8) = (*dirent).d_name[i] as _;
1067+
*(dirp.add(pos + 11 + i) as *mut c_char) = (*dirent).d_name[i] as c_char;
10671068
i += 1;
10681069
}
10691070
// We set the termination string char
1070-
*(dirp.add(pos + 11 + i) as *mut i8) = 0 as i8;
1071+
*(dirp.add(pos + 11 + i) as *mut c_char) = 0 as c_char;
10711072
debug!(
10721073
" => file {}",
1073-
CStr::from_ptr(dirp.add(pos + 11) as *const i8)
1074+
CStr::from_ptr(dirp.add(pos + 11) as *const c_char)
10741075
.to_str()
10751076
.unwrap()
10761077
);

0 commit comments

Comments
 (0)