]> git.lizzy.rs Git - rust.git/commitdiff
FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a void* [1]
authorMikaelUrankar <mikael.urankar@gmail.com>
Mon, 21 Jan 2019 17:52:57 +0000 (18:52 +0100)
committerMikaelUrankar <mikael.urankar@gmail.com>
Thu, 21 Mar 2019 15:53:31 +0000 (16:53 +0100)
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

src/libstd/sys/unix/stack_overflow.rs

index 8c60bddc23839c9b5b84e61cbc269a981f6acec2..561279e82785c317429a7cb0ce075581f93d5d0b 100644 (file)
@@ -140,6 +140,7 @@ unsafe fn get_stackp() -> *mut libc::c_void {
     #[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 @@ unsafe fn get_stack() -> libc::stack_t {
         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 }
     }