Skip to content

Commit 5054b3c

Browse files
committed
Auto merge of #851 - mneumann:dragonfly-several-fixes, r=alexcrichton
Several fixes for DragonFly With these changes in place, crate "nix" works (with some patches applied).
2 parents 5cacf97 + a9d80d6 commit 5054b3c

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/unix/bsd/freebsdlike/dragonfly/mod.rs

+4
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ pub const RAND_MAX: ::c_int = 0x7fff_ffff;
174174
pub const PTHREAD_STACK_MIN: ::size_t = 16384;
175175
pub const SIGSTKSZ: ::size_t = 40960;
176176
pub const MADV_INVAL: ::c_int = 10;
177+
pub const MADV_SETMAP: ::c_int = 11;
177178
pub const O_CLOEXEC: ::c_int = 0x00020000;
178179
pub const O_DIRECTORY: ::c_int = 0x08000000;
179180
pub const F_GETLK: ::c_int = 7;
@@ -713,6 +714,9 @@ pub const _SC_V7_LPBIG_OFFBIG: ::c_int = 125;
713714
pub const _SC_THREAD_ROBUST_PRIO_INHERIT: ::c_int = 126;
714715
pub const _SC_THREAD_ROBUST_PRIO_PROTECT: ::c_int = 127;
715716

717+
pub const WCONTINUED: ::c_int = 4;
718+
pub const WSTOPPED: ::c_int = 0o177;
719+
716720
extern {
717721
pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int)
718722
-> ::c_int;

src/unix/bsd/freebsdlike/freebsd/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,9 @@ extern {
861861
pub fn msgsnd(msqid: ::c_int, msgp: *const ::c_void, msgsz: ::size_t,
862862
msgflg: ::c_int) -> ::c_int;
863863
pub fn cfmakesane(termios: *mut ::termios);
864+
pub fn fexecve(fd: ::c_int, argv: *const *const ::c_char,
865+
envp: *const *const ::c_char)
866+
-> ::c_int;
864867
}
865868

866869
cfg_if! {

src/unix/bsd/freebsdlike/mod.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1105,9 +1105,6 @@ extern {
11051105
timeout: *const ::timespec,
11061106
sigmask: *const sigset_t) -> ::c_int;
11071107
pub fn settimeofday(tv: *const ::timeval, tz: *const ::timezone) -> ::c_int;
1108-
pub fn fexecve(fd: ::c_int, argv: *const *const ::c_char,
1109-
envp: *const *const ::c_char)
1110-
-> ::c_int;
11111108
}
11121109

11131110
cfg_if! {

0 commit comments

Comments
 (0)