diff options
author | bors <bors@rust-lang.org> | 2021-06-09 00:50:53 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2021-06-09 00:50:53 +0000 |
commit | 28a74003849c5707af0df9c346b51f6cf438a8f7 (patch) | |
tree | c47611fa4cbd523e737e647cde9a07b096193548 | |
parent | 0cffbc1bdf62671c1576696a5475d87a37371d82 (diff) | |
parent | fd2868cffad0f8b606c641e243b21e8d6c2ad85c (diff) | |
download | rust-libc-28a74003849c5707af0df9c346b51f6cf438a8f7.tar.gz |
Auto merge of #2218 - devnexen:bsd_complete_accept_filter_impl, r=JohnTitor
netbsd/freebsd adding accept_filter_arg as SO_ACCEPTFILTER only makes…
… sense with
-rw-r--r-- | libc-test/semver/freebsd.txt | 1 | ||||
-rw-r--r-- | libc-test/semver/netbsd.txt | 1 | ||||
-rw-r--r-- | src/unix/bsd/freebsdlike/freebsd/mod.rs | 5 | ||||
-rw-r--r-- | src/unix/bsd/netbsdlike/netbsd/mod.rs | 5 |
4 files changed, 12 insertions, 0 deletions
diff --git a/libc-test/semver/freebsd.txt b/libc-test/semver/freebsd.txt index af969783ab..26e20b435c 100644 --- a/libc-test/semver/freebsd.txt +++ b/libc-test/semver/freebsd.txt @@ -1323,6 +1323,7 @@ __xuname _sem abs accept4 +accept_filter_arg acct aio_cancel aio_error diff --git a/libc-test/semver/netbsd.txt b/libc-test/semver/netbsd.txt index 987813465d..384f6cad37 100644 --- a/libc-test/semver/netbsd.txt +++ b/libc-test/semver/netbsd.txt @@ -1018,6 +1018,7 @@ _cpuset_zero _lwp_self abs accept4 +accept_filter_arg acct aio_cancel aio_error diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index 40337e3ec5..c634038e1b 100644 --- a/src/unix/bsd/freebsdlike/freebsd/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs @@ -112,6 +112,11 @@ 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/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index fdbd64aa76..0aee1ec515 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -435,6 +435,11 @@ s! { pub struct _cpuset { bits: [u32; 0] } + + pub struct accept_filter_arg { + pub af_name: [::c_char; 16], + af_arg: [[::c_char; 10]; 24], + } } s_no_extra_traits! { |