diff options
| author | bors <bors@rust-lang.org> | 2019-03-22 14:19:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-22 14:19:42 +0000 |
| commit | ed196221d889ae8a87be677402e4319237ef67f4 (patch) | |
| tree | 7bf907650a0d72ec3ab4c4f3b60876479d98a31e /src/libstd/sys | |
| parent | 2210e9a6a99c4241d82e85ca71fd291d5ef91c7f (diff) | |
| parent | 6b766baf4a32b8386b0271d40801a498fee00155 (diff) | |
| download | rust-ed196221d889ae8a87be677402e4319237ef67f4.tar.gz rust-ed196221d889ae8a87be677402e4319237ef67f4.zip | |
Auto merge of #57810 - MikaelUrankar:stack_t_bsd, r=nagisa
FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a void* …d* [1] dragonflybsd still uses c_char [2] [1] https://svnweb.freebsd.org/base/releng/11.2/sys/sys/signal.h?revision=334459&view=markup#l438 [2] https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/sys/signal.h#L339
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/stack_overflow.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/stack_overflow.rs b/src/libstd/sys/unix/stack_overflow.rs index 8c60bddc238..561279e8278 100644 --- a/src/libstd/sys/unix/stack_overflow.rs +++ b/src/libstd/sys/unix/stack_overflow.rs @@ -140,6 +140,7 @@ mod imp { #[cfg(any(target_os = "linux", target_os = "macos", target_os = "bitrig", + target_os = "freebsd", target_os = "netbsd", target_os = "openbsd", target_os = "solaris"))] @@ -147,8 +148,7 @@ mod imp { libc::stack_t { ss_sp: get_stackp(), ss_flags: 0, ss_size: SIGSTKSZ } } - #[cfg(any(target_os = "freebsd", - target_os = "dragonfly"))] + #[cfg(target_os = "dragonfly")] unsafe fn get_stack() -> libc::stack_t { libc::stack_t { ss_sp: get_stackp() as *mut i8, ss_flags: 0, ss_size: SIGSTKSZ } } |