diff options
| author | bors <bors@rust-lang.org> | 2022-01-04 03:25:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-04 03:25:19 +0000 |
| commit | 484570d766463c8e1880e96620307e0d6fd0f6be (patch) | |
| tree | 47675bc3d9a14d014b35fa2a80aaabfb56a37eae | |
| parent | f51fd85a810b7dcdfcc2da5efd22ab7eaedc0196 (diff) | |
| parent | fbadd6310bf138776134a7a29277ffc8e34a8548 (diff) | |
| download | rust-libc-484570d766463c8e1880e96620307e0d6fd0f6be.tar.gz | |
Auto merge of #2611 - devnexen:dfbsd_so_acceptfilter, r=Amanieu
dragonflybsd accept_filter_arg support for SO_ACCEPTFILTER.
| -rw-r--r-- | libc-test/semver/dragonfly.txt | 1 | ||||
| -rw-r--r-- | src/unix/bsd/freebsdlike/freebsd/mod.rs | 5 | ||||
| -rw-r--r-- | src/unix/bsd/freebsdlike/mod.rs | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/libc-test/semver/dragonfly.txt b/libc-test/semver/dragonfly.txt index 5483ad3c6a..70f6844873 100644 --- a/libc-test/semver/dragonfly.txt +++ b/libc-test/semver/dragonfly.txt @@ -1189,6 +1189,7 @@ _UTX_LINESIZE _UTX_USERSIZE __errno_location abs +accept_filter_arg accept4 acct aio_cancel diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index b765fe44ea..e95e942bb9 100644 --- a/src/unix/bsd/freebsdlike/freebsd/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs @@ -325,11 +325,6 @@ s! { pub sc_groups: [::gid_t; 1], } - pub struct accept_filter_arg { - pub af_name: [::c_char; 16], - af_arg: [[::c_char; 10]; 24], - } - pub struct ptrace_vm_entry { pub pve_entry: ::c_int, pub pve_timestamp: ::c_int, diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs index c9cbb4c818..a784513d02 100644 --- a/src/unix/bsd/freebsdlike/mod.rs +++ b/src/unix/bsd/freebsdlike/mod.rs @@ -266,6 +266,11 @@ s! { pub time_state: ::c_int, } + pub struct accept_filter_arg { + pub af_name: [::c_char; 16], + af_arg: [[::c_char; 10]; 24], + } + pub struct ptrace_io_desc { pub piod_op: ::c_int, pub piod_offs: *mut ::c_void, |