Merge branch 'fix_arm64' into 'master'
Fix building for arm64 See merge request redox-os/relibc!636
This commit is contained in:
@@ -143,7 +143,7 @@ unsafe fn inner_af_inet(
|
||||
|
||||
let mut addr = in_addr::default();
|
||||
assert_eq!(
|
||||
inet_aton(raw_addr.as_ptr() as *mut i8, &mut addr),
|
||||
inet_aton(raw_addr.as_ptr() as *mut c_char, &mut addr),
|
||||
1,
|
||||
"inet_aton might be broken, failed to parse netstack address"
|
||||
);
|
||||
|
||||
@@ -42,7 +42,7 @@ pub type intptr_t = isize;
|
||||
pub type uintptr_t = usize;
|
||||
pub type ssize_t = isize;
|
||||
|
||||
pub type c_char = i8;
|
||||
pub type c_char = core::ffi::c_char;
|
||||
#[cfg(target_pointer_width = "32")]
|
||||
pub type c_long = i32;
|
||||
#[cfg(target_pointer_width = "32")]
|
||||
|
||||
Reference in New Issue
Block a user