Differential D18858 Diff 52942 head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_mod.rs
Changeset View
Changeset View
Standalone View
Standalone View
head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_mod.rs
--- src/vendor/libc/src/unix/bsd/freebsdlike/mod.rs.orig 2018-06-19 05:52:22 UTC | --- vendor/libc/src/unix/bsd/freebsdlike/mod.rs.orig 2018-06-19 05:52:22 UTC | ||||
+++ src/vendor/libc/src/unix/bsd/freebsdlike/mod.rs | +++ vendor/libc/src/unix/bsd/freebsdlike/mod.rs | ||||
@@ -1,4 +1,3 @@ | @@ -1,4 +1,3 @@ | ||||
-pub type c_char = i8; | -pub type c_char = i8; | ||||
pub type dev_t = u32; | pub type dev_t = u32; | ||||
pub type mode_t = u16; | pub type mode_t = u16; | ||||
pub type pthread_attr_t = *mut ::c_void; | pub type pthread_attr_t = *mut ::c_void; | ||||
@@ -84,7 +83,10 @@ s! { | @@ -84,7 +83,10 @@ s! { | ||||
pub struct stack_t { | pub struct stack_t { | ||||
// In FreeBSD 11 and later, ss_sp is actually a void* | // In FreeBSD 11 and later, ss_sp is actually a void* | ||||
+ #[cfg(not(target_arch = "aarch64"))] | + #[cfg(not(target_arch = "aarch64"))] | ||||
pub ss_sp: *mut ::c_char, | pub ss_sp: *mut ::c_char, | ||||
+ #[cfg(target_arch = "aarch64")] | + #[cfg(target_arch = "aarch64")] | ||||
+ pub ss_sp: *mut ::c_void, | + pub ss_sp: *mut ::c_void, | ||||
pub ss_size: ::size_t, | pub ss_size: ::size_t, | ||||
pub ss_flags: ::c_int, | pub ss_flags: ::c_int, | ||||
} | } |