Skip to content

Commit 24a8e7e

Browse files
committed
Revert "Fix a few other array size hacks"
This reverts commit d63be8b.
1 parent 7b80739 commit 24a8e7e

File tree

2 files changed

+3
-8
lines changed
  • src/unix/bsd

2 files changed

+3
-8
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ s! {
11441144
pub sinfo_assoc_id: ::sctp_assoc_t,
11451145
pub sinfo_keynumber: u16,
11461146
pub sinfo_keynumber_valid: u16,
1147-
pub __reserve_pad: [u8; SCTP_ALIGN_RESV_PAD],
1147+
pub __reserve_pad: [[u8; 23]; 4],
11481148
}
11491149

11501150
pub struct sctp_extrcvinfo {
@@ -1164,7 +1164,7 @@ s! {
11641164
pub serinfo_next_ppid: u32,
11651165
pub sinfo_keynumber: u16,
11661166
pub sinfo_keynumber_valid: u16,
1167-
pub __reserve_pad: [u8; SCTP_ALIGN_RESV_PAD_SHORT],
1167+
pub __reserve_pad: [[u8; 19]; 4],
11681168
}
11691169

11701170
pub struct sctp_sndinfo {
@@ -4865,11 +4865,6 @@ pub const SCTP_ASSOC_RESET_FAILED: ::c_int = 0x0008;
48654865
pub const SCTP_STREAM_CHANGE_DENIED: ::c_int = 0x0004;
48664866
pub const SCTP_STREAM_CHANGE_FAILED: ::c_int = 0x0008;
48674867

4868-
// sctp_uio.h
4869-
4870-
pub const SCTP_ALIGN_RESV_PAD: usize = 92;
4871-
pub const SCTP_ALIGN_RESV_PAD_SHORT: usize = 76;
4872-
48734868
pub const KENV_DUMP_LOADER: ::c_int = 4;
48744869
pub const KENV_DUMP_STATIC: ::c_int = 5;
48754870

src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ s! {
520520

521521
pub struct accept_filter_arg {
522522
pub af_name: [::c_char; 16],
523-
pub af_arg: [::c_char; 256 - 16],
523+
af_arg: [[::c_char; 10]; 24],
524524
}
525525

526526
pub struct ki_sigset_t {

0 commit comments

Comments
 (0)