Skip to content

Commit 3616414

Browse files
committed
Remove the long_array conditional
(apply <#4096> to `main`) (cherry picked from commit 756a285)
1 parent c451445 commit 3616414

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

src/unix/bsd/apple/long_array.rs

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/unix/bsd/apple/mod.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,6 +1262,12 @@ s! {
12621262
pub iffmid_id: u32,
12631263
pub iffmid_str: [::c_char; 1],
12641264
}
1265+
1266+
// kern_control.h
1267+
pub struct ctl_info {
1268+
pub ctl_id: u32,
1269+
pub ctl_name: [::c_char; MAX_KCTL_NAME],
1270+
}
12651271
}
12661272

12671273
s_no_extra_traits! {
@@ -5565,6 +5571,9 @@ pub const NETLINK_GENERIC: ::c_int = 0;
55655571
pub const DOT3COMPLIANCE_STATS: ::c_int = 1;
55665572
pub const DOT3COMPLIANCE_COLLS: ::c_int = 2;
55675573

5574+
// kern_control.h
5575+
pub const MAX_KCTL_NAME: usize = 96;
5576+
55685577
f! {
55695578
pub fn CMSG_NXTHDR(mhdr: *const ::msghdr,
55705579
cmsg: *const ::cmsghdr) -> *mut ::cmsghdr {
@@ -6584,6 +6593,3 @@ cfg_if! {
65846593
// Unknown target_arch
65856594
}
65866595
}
6587-
6588-
mod long_array;
6589-
pub use self::long_array::*;

0 commit comments

Comments
 (0)