diff --git a/src/fuchsia/aarch64.rs b/src/fuchsia/aarch64.rs index 577f0d99cf24d..93090f7238d7a 100644 --- a/src/fuchsia/aarch64.rs +++ b/src/fuchsia/aarch64.rs @@ -15,10 +15,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad0: c_ulong, + __pad0: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, - __pad1: c_int, + __pad1: Padding, pub st_blocks: crate::blkcnt_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -26,7 +26,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_uint; 2], + __unused: Padding<[c_uint; 2]>, } pub struct stat64 { @@ -37,10 +37,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad0: c_ulong, + __pad0: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, - __pad1: c_int, + __pad1: Padding, pub st_blocks: crate::blkcnt_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -48,7 +48,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_uint; 2], + __unused: Padding<[c_uint; 2]>, } pub struct ipc_perm { @@ -59,8 +59,8 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __unused1: Padding, + __unused2: Padding, } } diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs index ded19f85eea3e..1b99f98f021a2 100644 --- a/src/fuchsia/mod.rs +++ b/src/fuchsia/mod.rs @@ -121,46 +121,46 @@ s! { pub ru_stime: timeval, pub ru_maxrss: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad1: u32, + __pad1: Padding, pub ru_ixrss: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad2: u32, + __pad2: Padding, pub ru_idrss: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad3: u32, + __pad3: Padding, pub ru_isrss: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad4: u32, + __pad4: Padding, pub ru_minflt: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad5: u32, + __pad5: Padding, pub ru_majflt: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad6: u32, + __pad6: Padding, pub ru_nswap: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad7: u32, + __pad7: Padding, pub ru_inblock: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad8: u32, + __pad8: Padding, pub ru_oublock: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad9: u32, + __pad9: Padding, pub ru_msgsnd: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad10: u32, + __pad10: Padding, pub ru_msgrcv: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad11: u32, + __pad11: Padding, pub ru_nsignals: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad12: u32, + __pad12: Padding, pub ru_nvcsw: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad13: u32, + __pad13: Padding, pub ru_nivcsw: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad14: u32, + __pad14: Padding, } pub struct in_addr { @@ -427,11 +427,11 @@ s! { pub gl_offs: size_t, pub gl_flags: c_int, - __unused1: *mut c_void, - __unused2: *mut c_void, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, } pub struct ifaddrs { @@ -516,7 +516,7 @@ s! { pub ssi_stime: u64, pub ssi_addr: u64, pub ssi_addr_lsb: u16, - _pad2: u16, + _pad2: Padding, pub ssi_syscall: i32, pub ssi_call_addr: u64, pub ssi_arch: u32, @@ -773,8 +773,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: c_ulong, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct msqid_ds { @@ -787,8 +787,8 @@ s! { pub msg_qbytes: crate::msglen_t, pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct statfs { @@ -811,10 +811,10 @@ s! { pub msg_namelen: crate::socklen_t, pub msg_iov: *mut crate::iovec, pub msg_iovlen: c_int, - __pad1: c_int, + __pad1: Padding, pub msg_control: *mut c_void, pub msg_controllen: crate::socklen_t, - __pad2: crate::socklen_t, + __pad2: Padding, pub msg_flags: c_int, } @@ -900,7 +900,7 @@ s! { pub struct sockaddr_storage { pub ss_family: sa_family_t, - __ss_pad2: [u8; 128 - 2 - 8], + __ss_pad2: Padding<[u8; 128 - 2 - 8]>, __ss_align: size_t, } @@ -957,7 +957,7 @@ s! { pub struct sockaddr_nl { pub nl_family: crate::sa_family_t, - nl_pad: c_ushort, + nl_pad: Padding, pub nl_pid: u32, pub nl_groups: u32, } diff --git a/src/fuchsia/riscv64.rs b/src/fuchsia/riscv64.rs index c57d52aad1386..bc93cc3bff0a9 100644 --- a/src/fuchsia/riscv64.rs +++ b/src/fuchsia/riscv64.rs @@ -17,7 +17,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -28,7 +28,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_long; 3], + __unused: Padding<[c_long; 3]>, } // Not actually used, IPC calls just return ENOSYS @@ -40,7 +40,7 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __unused1: Padding, + __unused2: Padding, } } diff --git a/src/fuchsia/x86_64.rs b/src/fuchsia/x86_64.rs index 2ce21e20fefc4..fc42cd9810985 100644 --- a/src/fuchsia/x86_64.rs +++ b/src/fuchsia/x86_64.rs @@ -14,7 +14,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -25,7 +25,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_long; 3], + __unused: Padding<[c_long; 3]>, } pub struct stat64 { @@ -35,7 +35,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -46,7 +46,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __reserved: [c_long; 3], + __reserved: Padding<[c_long; 3]>, } pub struct mcontext_t { @@ -61,8 +61,8 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_int, - __unused1: c_long, - __unused2: c_long, + __unused1: Padding, + __unused2: Padding, } pub struct ucontext_t { diff --git a/src/hermit.rs b/src/hermit.rs index b96be6b0e2a2f..e8699228b6001 100644 --- a/src/hermit.rs +++ b/src/hermit.rs @@ -87,9 +87,9 @@ s! { pub struct sockaddr_storage { pub ss_len: u8, pub ss_family: sa_family_t, - __ss_pad1: [u8; 6], + __ss_pad1: Padding<[u8; 6]>, __ss_align: i64, - __ss_pad2: [u8; 112], + __ss_pad2: Padding<[u8; 112]>, } pub struct stat { diff --git a/src/new/linux_uapi/linux/can.rs b/src/new/linux_uapi/linux/can.rs index c8ae6d46a44e8..6bacd9d36da4c 100644 --- a/src/new/linux_uapi/linux/can.rs +++ b/src/new/linux_uapi/linux/can.rs @@ -41,7 +41,7 @@ s! { pub can_id: canid_t, // FIXME(1.0): this field was renamed to `len` in Linux 5.11 pub can_dlc: u8, - __pad: u8, + __pad: Padding, __res0: u8, pub len8_dlc: u8, pub data: [u8; CAN_MAX_DLEN], diff --git a/src/types.rs b/src/types.rs index 7d49a425d59ea..4a7514564b22b 100644 --- a/src/types.rs +++ b/src/types.rs @@ -1,5 +1,7 @@ //! Platform-agnostic support types. +#[cfg(feature = "extra_traits")] +use core::hash::Hash; use core::mem::MaybeUninit; use crate::prelude::*; @@ -30,6 +32,24 @@ impl fmt::Debug for Padding { } } +/// Do nothing when hashing to ignore the existence of padding fields. +#[cfg(feature = "extra_traits")] +impl Hash for Padding { + fn hash(&self, _state: &mut H) {} +} + +/// Padding fields are all equal, regardless of what is inside them, so they do not affect anything. +#[cfg(feature = "extra_traits")] +impl PartialEq for Padding { + fn eq(&self, _other: &Self) -> bool { + true + } +} + +/// Mark that `Padding` implements `Eq` so that it can be used in types that implement it. +#[cfg(feature = "extra_traits")] +impl Eq for Padding {} + /// The default repr type used for C style enums in Rust. #[cfg(target_env = "msvc")] #[allow(unused)] diff --git a/src/unix/aix/mod.rs b/src/unix/aix/mod.rs index db804555c87a7..0fd9b7e95366f 100644 --- a/src/unix/aix/mod.rs +++ b/src/unix/aix/mod.rs @@ -251,9 +251,9 @@ s! { pub struct sockaddr_storage { pub __ss_len: c_uchar, pub ss_family: sa_family_t, - __ss_pad1: [c_char; 6], + __ss_pad1: Padding<[c_char; 6]>, __ss_align: crate::int64_t, - __ss_pad2: [c_char; 1265], + __ss_pad2: Padding<[c_char; 1265]>, } pub struct sockaddr_un { diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index e496cba6ef7c8..fc2f21012bb8c 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -261,18 +261,18 @@ s! { pub struct glob_t { pub gl_pathc: size_t, - __unused1: c_int, + __unused1: Padding, pub gl_offs: size_t, - __unused2: c_int, + __unused2: Padding, pub gl_pathv: *mut *mut c_char, - __unused3: *mut c_void, + __unused3: Padding<*mut c_void>, - __unused4: *mut c_void, - __unused5: *mut c_void, - __unused6: *mut c_void, - __unused7: *mut c_void, - __unused8: *mut c_void, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, + __unused6: Padding<*mut c_void>, + __unused7: Padding<*mut c_void>, + __unused8: Padding<*mut c_void>, } pub struct addrinfo { @@ -336,7 +336,7 @@ s! { pub si_addr: *mut c_void, //Requires it to be union for tests //pub si_value: crate::sigval, - _pad: [usize; 9], + _pad: Padding<[usize; 9]>, } pub struct sigaction { @@ -1085,7 +1085,7 @@ s! { pub tcpi_state: u8, pub tcpi_snd_wscale: u8, pub tcpi_rcv_wscale: u8, - __pad1: u8, + __pad1: Padding, pub tcpi_options: u32, pub tcpi_flags: u32, pub tcpi_rto: u32, @@ -1113,7 +1113,7 @@ s! { pub tcpi_tfo_send_blackhole: u32, pub tcpi_tfo_recv_blackhole: u32, pub tcpi_tfo_onebyte_proxy: u32, - __pad2: u32, + __pad2: Padding, pub tcpi_txpackets: u64, pub tcpi_txbytes: u64, pub tcpi_txretransmitbytes: u64, @@ -1349,9 +1349,9 @@ s! { pub struct sockaddr_storage { pub ss_len: u8, pub ss_family: crate::sa_family_t, - __ss_pad1: [u8; 6], + __ss_pad1: Padding<[u8; 6]>, __ss_align: i64, - __ss_pad2: [u8; 112], + __ss_pad2: Padding<[u8; 112]>, } pub struct utmpx { @@ -1369,7 +1369,7 @@ s! { pub sigev_notify: c_int, pub sigev_signo: c_int, pub sigev_value: crate::sigval, - __unused1: *mut c_void, //actually a function pointer + __unused1: Padding<*mut c_void>, //actually a function pointer pub sigev_notify_attributes: *mut crate::pthread_attr_t, } pub struct processor_cpu_load_info { diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs index 2b49d26112bc4..1798d415c6361 100644 --- a/src/unix/bsd/freebsdlike/dragonfly/mod.rs +++ b/src/unix/bsd/freebsdlike/dragonfly/mod.rs @@ -438,8 +438,8 @@ s! { pub d_fileno: crate::ino_t, pub d_namlen: u16, pub d_type: u8, - __unused1: u8, - __unused2: u32, + __unused1: Padding, + __unused2: Padding, pub d_name: [c_char; 256], } @@ -472,13 +472,13 @@ s! { pub sigev_notify: c_int, // The union is 8-byte in size, so it is aligned at a 8-byte offset. #[cfg(target_pointer_width = "64")] - __unused1: c_int, + __unused1: Padding, pub sigev_signo: c_int, //actually a union // pad the union #[cfg(target_pointer_width = "64")] - __unused2: c_int, + __unused2: Padding, pub sigev_value: crate::sigval, - __unused3: *mut c_void, //actually a function pointer + __unused3: Padding<*mut c_void>, //actually a function pointer } pub struct mcontext_t { @@ -511,8 +511,8 @@ s! { pub mc_len: c_uint, pub mc_fpformat: c_uint, pub mc_ownedfp: c_uint, - __reserved: c_uint, - __unused: [c_uint; 8], + __reserved: Padding, + __unused: Padding<[c_uint; 8]>, pub mc_fpregs: [c_uint; 256], } @@ -525,7 +525,7 @@ s! { pub uc_stack: stack_t, pub uc_cofunc: Option, pub uc_arg: *mut c_void, - __pad: [c_int; 4], + __pad: Padding<[c_int; 4]>, } } diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs index 8a8f6b4f10126..cd0c3e071012f 100644 --- a/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs +++ b/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs @@ -24,6 +24,6 @@ s! { pub st_lspare: i32, pub st_birthtime: crate::time_t, pub st_birthtime_nsec: c_long, - __unused: [u8; 8], + __unused: Padding<[u8; 8]>, } } diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs index f6eebeb30bf95..dc63bdd5e322d 100644 --- a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs @@ -260,9 +260,9 @@ s! { pub d_off: off_t, pub d_reclen: u16, pub d_type: u8, - d_pad0: u8, + d_pad0: Padding, pub d_namlen: u16, - d_pad1: u16, + d_pad1: Padding, pub d_name: [c_char; 256], } diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs index 2044d583069ea..8c33d611b736d 100644 --- a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs @@ -273,9 +273,9 @@ s! { pub d_off: off_t, pub d_reclen: u16, pub d_type: u8, - d_pad0: u8, + d_pad0: Padding, pub d_namlen: u16, - d_pad1: u16, + d_pad1: Padding, pub d_name: [c_char; 256], } diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs index 263dbc12f9b98..c85f242754ce1 100644 --- a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs @@ -275,9 +275,9 @@ s! { pub d_off: off_t, pub d_reclen: u16, pub d_type: u8, - d_pad0: u8, + d_pad0: Padding, pub d_namlen: u16, - d_pad1: u16, + d_pad1: Padding, pub d_name: [c_char; 256], } diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs index e7a948cf9d06e..5e939543c65b5 100644 --- a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs @@ -277,9 +277,9 @@ s! { pub d_off: off_t, pub d_reclen: u16, pub d_type: u8, - d_pad0: u8, + d_pad0: Padding, pub d_namlen: u16, - d_pad1: u16, + d_pad1: Padding, pub d_name: [c_char; 256], } diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index edbfe7dbe99f9..02b63ea68e33b 100644 --- a/src/unix/bsd/freebsdlike/freebsd/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs @@ -249,8 +249,8 @@ s! { pub struct msqid_ds { pub msg_perm: crate::ipc_perm, - __unused1: *mut c_void, - __unused2: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, pub msg_cbytes: crate::msglen_t, pub msg_qnum: crate::msgqnum_t, pub msg_qbytes: crate::msglen_t, @@ -1056,7 +1056,7 @@ s! { pub struct shm_largepage_conf { pub psind: c_int, pub alloc_policy: c_int, - __pad: [c_int; 10], + __pad: Padding<[c_int; 10]>, } pub struct memory_type { @@ -1391,7 +1391,7 @@ s! { pub mq_maxmsg: c_long, pub mq_msgsize: c_long, pub mq_curmsgs: c_long, - __reserved: [c_long; 4], + __reserved: Padding<[c_long; 4]>, } pub struct ptsstat { @@ -1526,7 +1526,7 @@ s! { pub struct sctp_error_invalid_stream { pub cause: sctp_error_cause, pub stream_id: u16, - __reserved: u16, + __reserved: Padding, } #[repr(packed)] @@ -1576,11 +1576,11 @@ s! { pub kf_fd: c_int, pub kf_ref_count: c_int, pub kf_flags: c_int, - _kf_pad0: c_int, + _kf_pad0: Padding, pub kf_offset: i64, _priv: [u8; 304], // FIXME(freebsd): this is really a giant union pub kf_status: u16, - _kf_pad1: u16, + _kf_pad1: Padding, _kf_ispare0: c_int, pub kf_cap_rights: crate::cap_rights_t, _kf_cap_spare: u64, diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs index fe180c69f4ea8..30d78f5ff5263 100644 --- a/src/unix/bsd/freebsdlike/mod.rs +++ b/src/unix/bsd/freebsdlike/mod.rs @@ -113,12 +113,12 @@ s! { pub gl_offs: size_t, pub gl_flags: c_int, pub gl_pathv: *mut *mut c_char, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, - __unused6: *mut c_void, - __unused7: *mut c_void, - __unused8: *mut c_void, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, + __unused6: Padding<*mut c_void>, + __unused7: Padding<*mut c_void>, + __unused8: Padding<*mut c_void>, } pub struct addrinfo { @@ -145,8 +145,8 @@ s! { pub si_status: c_int, pub si_addr: *mut c_void, pub si_value: crate::sigval, - _pad1: c_long, - _pad2: [c_int; 7], + _pad1: Padding, + _pad2: Padding<[c_int; 7]>, } pub struct sigaction { @@ -385,9 +385,9 @@ s! { pub struct sockaddr_storage { pub ss_len: u8, pub ss_family: crate::sa_family_t, - __ss_pad1: [u8; 6], + __ss_pad1: Padding<[u8; 6]>, __ss_align: i64, - __ss_pad2: [u8; 112], + __ss_pad2: Padding<[u8; 112]>, } } diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index 7e3afa030fa64..35fd992dafff8 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -78,7 +78,7 @@ impl siginfo_t { _si_signo: c_int, _si_errno: c_int, _si_code: c_int, - __pad1: c_int, + __pad1: Padding, _pid: crate::pid_t, } (*(self as *const siginfo_t as *const siginfo_timer))._pid @@ -90,7 +90,7 @@ impl siginfo_t { _si_signo: c_int, _si_errno: c_int, _si_code: c_int, - __pad1: c_int, + __pad1: Padding, _pid: crate::pid_t, _uid: crate::uid_t, } @@ -103,7 +103,7 @@ impl siginfo_t { _si_signo: c_int, _si_errno: c_int, _si_code: c_int, - __pad1: c_int, + __pad1: Padding, _pid: crate::pid_t, _uid: crate::uid_t, value: crate::sigval, @@ -117,7 +117,7 @@ impl siginfo_t { _si_signo: c_int, _si_errno: c_int, _si_code: c_int, - __pad1: c_int, + __pad1: Padding, _pid: crate::pid_t, _uid: crate::uid_t, _value: crate::sigval, @@ -150,13 +150,13 @@ s! { pub gl_flags: c_int, pub gl_pathv: *mut *mut c_char, - __unused3: *mut c_void, + __unused3: Padding<*mut c_void>, - __unused4: *mut c_void, - __unused5: *mut c_void, - __unused6: *mut c_void, - __unused7: *mut c_void, - __unused8: *mut c_void, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, + __unused6: Padding<*mut c_void>, + __unused7: Padding<*mut c_void>, + __unused8: Padding<*mut c_void>, } pub struct mq_attr { @@ -209,9 +209,9 @@ s! { pub si_signo: c_int, pub si_code: c_int, pub si_errno: c_int, - __pad1: c_int, + __pad1: Padding, pub si_addr: *mut c_void, - __pad2: [u64; 13], + __pad2: Padding<[u64; 13]>, } pub struct pthread_attr_t { @@ -555,8 +555,8 @@ s! { pub l_priority: u8, pub l_usrpri: u8, pub l_stat: i8, - l_pad1: i8, - l_pad2: i32, + l_pad1: Padding, + l_pad2: Padding, pub l_wmesg: [c_char; KI_WMESGLEN as usize], pub l_wchan: u64, pub l_cpuid: u64, @@ -736,16 +736,16 @@ s! { pub struct sockaddr_storage { pub ss_len: u8, pub ss_family: crate::sa_family_t, - __ss_pad1: [u8; 6], - __ss_pad2: i64, - __ss_pad3: [u8; 112], + __ss_pad1: Padding<[u8; 6]>, + __ss_pad2: Padding, + __ss_pad3: Padding<[u8; 112]>, } pub struct sigevent { pub sigev_notify: c_int, pub sigev_signo: c_int, pub sigev_value: crate::sigval, - __unused1: *mut c_void, //actually a function pointer + __unused1: Padding<*mut c_void>, //actually a function pointer pub sigev_notify_attributes: *mut c_void, } } diff --git a/src/unix/bsd/netbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsd/mod.rs index 12f9fd45dd137..c9095a0aa66b3 100644 --- a/src/unix/bsd/netbsdlike/openbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/openbsd/mod.rs @@ -75,13 +75,13 @@ s! { pub gl_offs: size_t, pub gl_flags: c_int, pub gl_pathv: *mut *mut c_char, - __unused1: *mut c_void, - __unused2: *mut c_void, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, - __unused6: *mut c_void, - __unused7: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, + __unused6: Padding<*mut c_void>, + __unused7: Padding<*mut c_void>, } pub struct lconv { @@ -733,7 +733,7 @@ impl siginfo_t { _si_signo: c_int, _si_code: c_int, _si_errno: c_int, - _pad: [c_int; SI_PAD], + _pad: Padding<[c_int; SI_PAD]>, _pid: crate::pid_t, } (*(self as *const siginfo_t).cast::())._pid @@ -745,7 +745,7 @@ impl siginfo_t { _si_signo: c_int, _si_code: c_int, _si_errno: c_int, - _pad: [c_int; SI_PAD], + _pad: Padding<[c_int; SI_PAD]>, _pid: crate::pid_t, _uid: crate::uid_t, } @@ -758,7 +758,7 @@ impl siginfo_t { _si_signo: c_int, _si_code: c_int, _si_errno: c_int, - _pad: [c_int; SI_PAD], + _pad: Padding<[c_int; SI_PAD]>, _pid: crate::pid_t, _uid: crate::uid_t, value: crate::sigval, diff --git a/src/unix/cygwin/mod.rs b/src/unix/cygwin/mod.rs index 6dee1217953cc..172e009dcfba4 100644 --- a/src/unix/cygwin/mod.rs +++ b/src/unix/cygwin/mod.rs @@ -367,9 +367,9 @@ s! { pub struct sockaddr_storage { pub ss_family: sa_family_t, - __ss_pad1: [c_char; 6], + __ss_pad1: Padding<[c_char; 6]>, __ss_align: i64, - __ss_pad2: [c_char; 112], + __ss_pad2: Padding<[c_char; 112]>, } pub struct stat { @@ -461,7 +461,7 @@ s! { pub si_pid: pid_t, pub si_uid: uid_t, pub si_errno: c_int, - __pad: [u32; 32], + __pad: Padding<[u32; 32]>, } pub struct dirent { @@ -491,7 +491,7 @@ s_no_extra_traits! { pub ifru_mtu: c_int, pub ifru_ifindex: c_int, pub ifru_data: *mut c_char, - __ifru_pad: [c_char; 28], + __ifru_pad: Padding<[c_char; 28]>, } pub struct ifreq { diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs index 7bea75978d535..31f867f2264bd 100644 --- a/src/unix/haiku/mod.rs +++ b/src/unix/haiku/mod.rs @@ -276,17 +276,17 @@ s! { pub struct glob_t { pub gl_pathc: size_t, - __unused1: size_t, + __unused1: Padding, pub gl_offs: size_t, - __unused2: size_t, + __unused2: Padding, pub gl_pathv: *mut *mut c_char, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, - __unused6: *mut c_void, - __unused7: *mut c_void, - __unused8: *mut c_void, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, + __unused6: Padding<*mut c_void>, + __unused7: Padding<*mut c_void>, + __unused8: Padding<*mut c_void>, } pub struct pthread_mutex_t { @@ -466,9 +466,9 @@ s! { pub struct sockaddr_storage { pub ss_len: u8, pub ss_family: sa_family_t, - __ss_pad1: [u8; 6], - __ss_pad2: u64, - __ss_pad3: [u8; 112], + __ss_pad1: Padding<[u8; 6]>, + __ss_pad2: Padding, + __ss_pad3: Padding<[u8; 112]>, } pub struct dirent { pub d_dev: dev_t, @@ -483,7 +483,7 @@ s! { pub sigev_notify: c_int, pub sigev_signo: c_int, pub sigev_value: crate::sigval, - __unused1: *mut c_void, // actually a function pointer + __unused1: Padding<*mut c_void>, // actually a function pointer pub sigev_notify_attributes: *mut crate::pthread_attr_t, } diff --git a/src/unix/haiku/native.rs b/src/unix/haiku/native.rs index 6c7f69acbd4ee..3ed686b8bbb4b 100644 --- a/src/unix/haiku/native.rs +++ b/src/unix/haiku/native.rs @@ -440,7 +440,7 @@ s! { } pub struct __c_anonymous_eax_3 { - __reserved: [u32; 2], + __reserved: Padding<[u32; 2]>, pub serial_number_high: u32, pub serial_number_low: u32, } diff --git a/src/unix/hurd/mod.rs b/src/unix/hurd/mod.rs index 3760b2fa734ac..d4f444f7b7f39 100644 --- a/src/unix/hurd/mod.rs +++ b/src/unix/hurd/mod.rs @@ -415,7 +415,7 @@ s! { pub sigev_value: crate::sigval, pub sigev_signo: c_int, pub sigev_notify: c_int, - __unused1: *mut c_void, //actually a function pointer + __unused1: Padding<*mut c_void>, //actually a function pointer pub sigev_notify_attributes: *mut pthread_attr_t, } @@ -495,7 +495,7 @@ s! { pub stx_uid: u32, pub stx_gid: u32, pub stx_mode: u16, - __statx_pad1: [u16; 1], + __statx_pad1: Padding<[u16; 1]>, pub stx_ino: u64, pub stx_size: u64, pub stx_blocks: u64, @@ -508,7 +508,7 @@ s! { pub stx_rdev_minor: u32, pub stx_dev_major: u32, pub stx_dev_minor: u32, - __statx_pad2: [u64; 14], + __statx_pad2: Padding<[u64; 14]>, } pub struct statx_timestamp { @@ -595,7 +595,7 @@ s! { __return_value: ssize_t, pub aio_offset: off_t, #[cfg(all(not(target_arch = "x86_64"), target_pointer_width = "32"))] - __unused1: [c_char; 4], + __unused1: Padding<[c_char; 4]>, __glibc_reserved: [c_char; 32], } @@ -921,11 +921,11 @@ s! { pub gl_offs: size_t, pub gl_flags: c_int, - __unused1: *mut c_void, - __unused2: *mut c_void, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, } pub struct glob64_t { @@ -934,11 +934,11 @@ s! { pub gl_offs: size_t, pub gl_flags: c_int, - __unused1: *mut c_void, - __unused2: *mut c_void, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, } pub struct regex_t { @@ -995,7 +995,7 @@ s! { __allocated: c_int, __used: c_int, __actions: *mut c_int, - __pad: [c_int; 16], + __pad: Padding<[c_int; 16]>, } pub struct posix_spawnattr_t { @@ -1005,7 +1005,7 @@ s! { __ss: crate::sigset_t, __sp: crate::sched_param, __policy: c_int, - __pad: [c_int; 16], + __pad: Padding<[c_int; 16]>, } pub struct regmatch_t { diff --git a/src/unix/linux_like/android/b32/arm.rs b/src/unix/linux_like/android/b32/arm.rs index 7fb2ff663bcac..1d2d34dfedc40 100644 --- a/src/unix/linux_like/android/b32/arm.rs +++ b/src/unix/linux_like/android/b32/arm.rs @@ -43,7 +43,7 @@ s! { pub uc_sigmask__c_anonymous_union: __c_anonymous_uc_sigmask, /* The kernel adds extra padding after uc_sigmask to match * glibc sigset_t on ARM. */ - __padding: [c_char; 120], + __padding: Padding<[c_char; 120]>, __align: [c_longlong; 0], uc_regspace: [c_ulong; 128], } diff --git a/src/unix/linux_like/android/b32/mod.rs b/src/unix/linux_like/android/b32/mod.rs index d02dbf92d7924..62c3c4c32a4b6 100644 --- a/src/unix/linux_like/android/b32/mod.rs +++ b/src/unix/linux_like/android/b32/mod.rs @@ -28,14 +28,14 @@ s! { pub struct stat { pub st_dev: c_ulonglong, - __pad0: [c_uchar; 4], + __pad0: Padding<[c_uchar; 4]>, __st_ino: crate::ino_t, pub st_mode: c_uint, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: c_ulonglong, - __pad3: [c_uchar; 4], + __pad3: Padding<[c_uchar; 4]>, pub st_size: c_longlong, pub st_blksize: crate::blksize_t, pub st_blocks: c_ulonglong, @@ -50,14 +50,14 @@ s! { pub struct stat64 { pub st_dev: c_ulonglong, - __pad0: [c_uchar; 4], + __pad0: Padding<[c_uchar; 4]>, __st_ino: crate::ino_t, pub st_mode: c_uint, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: c_ulonglong, - __pad3: [c_uchar; 4], + __pad3: Padding<[c_uchar; 4]>, pub st_size: c_longlong, pub st_blksize: crate::blksize_t, pub st_blocks: c_ulonglong, diff --git a/src/unix/linux_like/android/b64/aarch64/mod.rs b/src/unix/linux_like/android/b64/aarch64/mod.rs index 3c6131089ee89..7c7a08fdf334f 100644 --- a/src/unix/linux_like/android/b64/aarch64/mod.rs +++ b/src/unix/linux_like/android/b64/aarch64/mod.rs @@ -14,10 +14,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad1: c_ulong, + __pad1: Padding, pub st_size: off64_t, pub st_blksize: c_int, - __pad2: c_int, + __pad2: Padding, pub st_blocks: c_long, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -25,8 +25,8 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused4: c_uint, - __unused5: c_uint, + __unused4: Padding, + __unused5: Padding, } pub struct stat64 { @@ -37,10 +37,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad1: c_ulong, + __pad1: Padding, pub st_size: off64_t, pub st_blksize: c_int, - __pad2: c_int, + __pad2: Padding, pub st_blocks: c_long, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -48,8 +48,8 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused4: c_uint, - __unused5: c_uint, + __unused4: Padding, + __unused5: Padding, } pub struct user_regs_struct { @@ -74,7 +74,7 @@ s! { pub sp: c_ulonglong, pub pc: c_ulonglong, pub pstate: c_ulonglong, - __reserved: [u64; 512], + __reserved: Padding<[u64; 512]>, } pub struct user_fpsimd_struct { diff --git a/src/unix/linux_like/android/b64/mod.rs b/src/unix/linux_like/android/b64/mod.rs index 7d5baef752e44..05ec19d85ad5e 100644 --- a/src/unix/linux_like/android/b64/mod.rs +++ b/src/unix/linux_like/android/b64/mod.rs @@ -33,7 +33,7 @@ s! { pub guard_size: size_t, pub sched_policy: i32, pub sched_priority: i32, - __reserved: [c_char; 16], + __reserved: Padding<[c_char; 16]>, } pub struct passwd { diff --git a/src/unix/linux_like/android/b64/riscv64/mod.rs b/src/unix/linux_like/android/b64/riscv64/mod.rs index ca8c727164ad7..dded1292b393f 100644 --- a/src/unix/linux_like/android/b64/riscv64/mod.rs +++ b/src/unix/linux_like/android/b64/riscv64/mod.rs @@ -15,10 +15,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad1: c_ulong, + __pad1: Padding, pub st_size: off64_t, pub st_blksize: c_int, - __pad2: c_int, + __pad2: Padding, pub st_blocks: c_long, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -26,8 +26,8 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused4: c_uint, - __unused5: c_uint, + __unused4: Padding, + __unused5: Padding, } pub struct stat64 { @@ -38,10 +38,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad1: c_ulong, + __pad1: Padding, pub st_size: off64_t, pub st_blksize: c_int, - __pad2: c_int, + __pad2: Padding, pub st_blocks: c_long, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -49,8 +49,8 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused4: c_uint, - __unused5: c_uint, + __unused4: Padding, + __unused5: Padding, } } diff --git a/src/unix/linux_like/android/b64/x86_64/mod.rs b/src/unix/linux_like/android/b64/x86_64/mod.rs index fd678d1f11108..801235d13ec1b 100644 --- a/src/unix/linux_like/android/b64/x86_64/mod.rs +++ b/src/unix/linux_like/android/b64/x86_64/mod.rs @@ -24,7 +24,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: c_long, pub st_ctime_nsec: c_long, - __unused: [c_long; 3], + __unused: Padding<[c_long; 3]>, } pub struct stat64 { @@ -44,7 +44,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: c_long, pub st_ctime_nsec: c_long, - __unused: [c_long; 3], + __unused: Padding<[c_long; 3]>, } pub struct _libc_xmmreg { @@ -91,12 +91,12 @@ s! { pub start_code: c_ulong, pub start_stack: c_ulong, pub signal: c_long, - __reserved: c_int, + __reserved: Padding, #[cfg(target_pointer_width = "32")] - __pad1: u32, + __pad1: Padding, pub u_ar0: *mut user_regs_struct, #[cfg(target_pointer_width = "32")] - __pad2: u32, + __pad2: Padding, pub u_fpstate: *mut user_fpregs_struct, pub magic: c_ulong, pub u_comm: [c_char; 32], @@ -108,7 +108,7 @@ s! { pub struct _libc_fpxreg { pub significand: [u16; 4], pub exponent: u16, - __padding: [u16; 3], + __padding: Padding<[u16; 3]>, } pub struct _libc_fpstate { diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index 93d494fb6825a..840def4a93bfc 100644 --- a/src/unix/linux_like/android/mod.rs +++ b/src/unix/linux_like/android/mod.rs @@ -137,7 +137,7 @@ s! { pub struct sem_t { count: c_uint, #[cfg(target_pointer_width = "64")] - __reserved: [c_int; 3], + __reserved: Padding<[c_int; 3]>, } pub struct exit_status { @@ -179,11 +179,11 @@ s! { pub ssi_stime: c_ulonglong, pub ssi_addr: c_ulonglong, pub ssi_addr_lsb: u16, - _pad2: u16, + _pad2: Padding, pub ssi_syscall: i32, pub ssi_call_addr: u64, pub ssi_arch: u32, - _pad: [u8; 28], + _pad: Padding<[u8; 28]>, } pub struct itimerspec { @@ -503,7 +503,7 @@ s! { pub struct sockaddr_nl { pub nl_family: crate::sa_family_t, - nl_pad: c_ushort, + nl_pad: Padding, pub nl_pid: u32, pub nl_groups: u32, } diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs index 306cf180e5c0b..820480213883b 100644 --- a/src/unix/linux_like/emscripten/mod.rs +++ b/src/unix/linux_like/emscripten/mod.rs @@ -52,11 +52,11 @@ s! { pub gl_offs: size_t, pub gl_flags: c_int, - __unused1: *mut c_void, - __unused2: *mut c_void, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, } pub struct passwd { @@ -115,11 +115,11 @@ s! { pub ssi_stime: u64, pub ssi_addr: u64, pub ssi_addr_lsb: u16, - _pad2: u16, + _pad2: Padding, pub ssi_syscall: i32, pub ssi_call_addr: u64, pub ssi_arch: u32, - _pad: [u8; 28], + _pad: Padding<[u8; 28]>, } pub struct fsid_t { @@ -170,8 +170,8 @@ s! { pub cgid: crate::gid_t, pub mode: mode_t, pub __seq: c_int, - __unused1: c_long, - __unused2: c_long, + __unused1: Padding, + __unused2: Padding, } pub struct termios { @@ -260,8 +260,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: c_ulong, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct msqid_ds { @@ -274,8 +274,8 @@ s! { pub msg_qbytes: crate::msglen_t, pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct statfs { diff --git a/src/unix/linux_like/linux/gnu/b32/arm/mod.rs b/src/unix/linux_like/linux/gnu/b32/arm/mod.rs index 40d90159553a9..dadaa7a8f6892 100644 --- a/src/unix/linux_like/linux/gnu/b32/arm/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/arm/mod.rs @@ -56,17 +56,17 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: c_ushort, - __pad1: c_ushort, + __pad1: Padding, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct stat64 { pub st_dev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - __pad1: c_uint, + __pad1: Padding, #[cfg(not(gnu_time_bits64))] __st_ino: c_ulong, #[cfg(gnu_time_bits64)] @@ -77,7 +77,7 @@ s! { pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - __pad2: c_uint, + __pad2: Padding, pub st_size: off64_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt64_t, @@ -133,18 +133,18 @@ s! { pub shm_segsz: size_t, pub shm_atime: crate::time_t, #[cfg(not(gnu_time_bits64))] - __unused1: c_ulong, + __unused1: Padding, pub shm_dtime: crate::time_t, #[cfg(not(gnu_time_bits64))] - __unused2: c_ulong, + __unused2: Padding, pub shm_ctime: crate::time_t, #[cfg(not(gnu_time_bits64))] - __unused3: c_ulong, + __unused3: Padding, pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct msqid_ds { diff --git a/src/unix/linux_like/linux/gnu/b32/csky/mod.rs b/src/unix/linux_like/linux/gnu/b32/csky/mod.rs index bb06c49df0a25..978b4398e9073 100644 --- a/src/unix/linux_like/linux/gnu/b32/csky/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/csky/mod.rs @@ -55,23 +55,23 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: c_ushort, - __pad1: c_ushort, + __pad1: Padding, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct stat64 { pub st_dev: crate::dev_t, - __pad1: c_uint, + __pad1: Padding, __st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad2: c_uint, + __pad2: Padding, pub st_size: off64_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt64_t, @@ -119,16 +119,16 @@ s! { pub shm_perm: crate::ipc_perm, pub shm_segsz: size_t, pub shm_atime: crate::time_t, - __unused1: c_ulong, + __unused1: Padding, pub shm_dtime: crate::time_t, - __unused2: c_ulong, + __unused2: Padding, pub shm_ctime: crate::time_t, - __unused3: c_ulong, + __unused3: Padding, pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct msqid_ds { diff --git a/src/unix/linux_like/linux/gnu/b32/m68k/mod.rs b/src/unix/linux_like/linux/gnu/b32/m68k/mod.rs index ceaab898074b4..721fe2d5aba99 100644 --- a/src/unix/linux_like/linux/gnu/b32/m68k/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/m68k/mod.rs @@ -57,21 +57,21 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, __seq: c_ushort, - __pad1: c_ushort, + __pad1: Padding, __glibc_reserved1: c_ulong, __glibc_reserved2: c_ulong, } pub struct stat64 { pub st_dev: crate::dev_t, - __pad1: c_ushort, + __pad1: Padding, pub __st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad2: c_ushort, + __pad2: Padding, pub st_size: off64_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt64_t, @@ -152,7 +152,7 @@ s! { pub si_signo: c_int, pub si_code: c_int, pub si_errno: c_int, - _pad: [c_int; 29], + _pad: Padding<[c_int; 29]>, _align: [usize; 0], } diff --git a/src/unix/linux_like/linux/gnu/b32/mips/mod.rs b/src/unix/linux_like/linux/gnu/b32/mips/mod.rs index 98ce89e124891..99af57a4460c0 100644 --- a/src/unix/linux_like/linux/gnu/b32/mips/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/mips/mod.rs @@ -14,7 +14,7 @@ s! { pub st_dev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - st_pad1: [c_long; 3], + st_pad1: Padding<[c_long; 3]>, pub st_ino: crate::ino_t, @@ -29,14 +29,14 @@ s! { pub st_rdev: crate::dev_t, #[cfg(not(gnu_file_offset_bits64))] - st_pad2: [c_long; 2], + st_pad2: Padding<[c_long; 2]>, #[cfg(all(not(gnu_time_bits64), gnu_file_offset_bits64))] - st_pad2: [c_long; 3], + st_pad2: Padding<[c_long; 3]>, pub st_size: off_t, #[cfg(not(gnu_file_offset_bits64))] - st_pad3: c_long, + st_pad3: Padding, #[cfg(gnu_time_bits64)] pub st_blksize: crate::blksize_t, @@ -59,11 +59,11 @@ s! { #[cfg(not(gnu_time_bits64))] pub st_blksize: crate::blksize_t, #[cfg(all(not(gnu_time_bits64), gnu_file_offset_bits64))] - st_pad4: c_long, + st_pad4: Padding, #[cfg(not(gnu_time_bits64))] pub st_blocks: crate::blkcnt_t, #[cfg(not(gnu_time_bits64))] - st_pad5: [c_long; 14], + st_pad5: Padding<[c_long; 14]>, } pub struct stat64 { @@ -73,7 +73,7 @@ s! { pub st_dev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - st_pad1: [c_long; 3], + st_pad1: Padding<[c_long; 3]>, pub st_ino: crate::ino64_t, pub st_mode: crate::mode_t, @@ -87,7 +87,7 @@ s! { pub st_rdev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - st_pad2: [c_long; 3], + st_pad2: Padding<[c_long; 3]>, pub st_size: off64_t, @@ -112,11 +112,11 @@ s! { #[cfg(not(gnu_time_bits64))] pub st_blksize: crate::blksize_t, #[cfg(not(gnu_time_bits64))] - st_pad3: c_long, + st_pad3: Padding, #[cfg(not(gnu_time_bits64))] pub st_blocks: crate::blkcnt64_t, #[cfg(not(gnu_time_bits64))] - st_pad5: [c_long; 14], + st_pad5: Padding<[c_long; 14]>, } pub struct statfs { @@ -197,9 +197,9 @@ s! { pub cgid: crate::gid_t, pub mode: c_uint, pub __seq: c_ushort, - __pad1: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad1: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -211,8 +211,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct msqid_ds { diff --git a/src/unix/linux_like/linux/gnu/b32/mod.rs b/src/unix/linux_like/linux/gnu/b32/mod.rs index fe843a7643207..1855693dc6c7a 100644 --- a/src/unix/linux_like/linux/gnu/b32/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/mod.rs @@ -81,7 +81,7 @@ cfg_if! { pub st_dev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - __pad1: c_uint, + __pad1: Padding, #[cfg(any(gnu_time_bits64, not(gnu_file_offset_bits64)))] pub st_ino: crate::ino_t, @@ -96,7 +96,7 @@ cfg_if! { pub st_rdev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - __pad2: c_uint, + __pad2: Padding, pub st_size: off_t, @@ -176,7 +176,7 @@ s! { pub struct semid_ds { pub sem_perm: ipc_perm, #[cfg(all(not(gnu_time_bits64), target_arch = "powerpc"))] - __reserved: crate::__syscall_ulong_t, + __reserved: Padding, pub sem_otime: crate::time_t, #[cfg(not(any( gnu_time_bits64, @@ -184,9 +184,9 @@ s! { target_arch = "mips32r6", target_arch = "powerpc" )))] - __reserved: crate::__syscall_ulong_t, + __reserved: Padding, #[cfg(all(not(gnu_time_bits64), target_arch = "powerpc"))] - __reserved2: crate::__syscall_ulong_t, + __reserved2: Padding, pub sem_ctime: crate::time_t, #[cfg(not(any( gnu_time_bits64, @@ -194,7 +194,7 @@ s! { target_arch = "mips32r6", target_arch = "powerpc" )))] - __reserved2: crate::__syscall_ulong_t, + __reserved2: Padding, pub sem_nsems: crate::__syscall_ulong_t, #[cfg(all( gnu_time_bits64, @@ -206,7 +206,7 @@ s! { target_arch = "x86" )) ))] - __reserved2: crate::__syscall_ulong_t, + __reserved2: Padding, __glibc_reserved3: crate::__syscall_ulong_t, __glibc_reserved4: crate::__syscall_ulong_t, } @@ -214,13 +214,13 @@ s! { #[cfg(gnu_time_bits64)] pub struct timex { pub modes: c_uint, - _pad1: c_int, + _pad1: Padding, pub offset: c_longlong, pub freq: c_longlong, pub maxerror: c_longlong, pub esterror: c_longlong, pub status: c_int, - _pad2: c_int, + _pad2: Padding, pub constant: c_longlong, pub precision: c_longlong, pub tolerance: c_longlong, @@ -229,7 +229,7 @@ s! { pub ppsfreq: c_longlong, pub jitter: c_longlong, pub shift: c_int, - _pad3: c_int, + _pad3: Padding, pub stabil: c_longlong, pub jitcnt: c_longlong, pub calcnt: c_longlong, diff --git a/src/unix/linux_like/linux/gnu/b32/powerpc.rs b/src/unix/linux_like/linux/gnu/b32/powerpc.rs index 54470e10d6145..c84ee0c95cad5 100644 --- a/src/unix/linux_like/linux/gnu/b32/powerpc.rs +++ b/src/unix/linux_like/linux/gnu/b32/powerpc.rs @@ -57,7 +57,7 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, __seq: u32, - __pad1: u32, + __pad1: Padding, __glibc_reserved1: u64, __glibc_reserved2: u64, } @@ -65,7 +65,7 @@ s! { pub struct stat { pub st_dev: crate::dev_t, #[cfg(not(gnu_file_offset_bits64))] - __pad1: c_ushort, + __pad1: Padding, pub st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, @@ -73,7 +73,7 @@ s! { pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - __pad2: c_ushort, + __pad2: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt_t, @@ -104,7 +104,7 @@ s! { pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - __pad2: c_ushort, + __pad2: Padding, pub st_size: off64_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt64_t, diff --git a/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs b/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs index f4f04c91b7f87..8da10a3c543b6 100644 --- a/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs @@ -42,7 +42,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2], + __unused: Padding<[c_int; 2]>, } pub struct statfs { @@ -127,11 +127,11 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: c_ushort, - __pad1: c_ushort, + __pad1: Padding, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -143,8 +143,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused5: c_ulong, - __unused6: c_ulong, + __unused5: Padding, + __unused6: Padding, } pub struct flock { diff --git a/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs b/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs index 03ecff3f342e1..303d4a1135715 100644 --- a/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs @@ -39,7 +39,7 @@ s! { pub si_signo: c_int, pub si_errno: c_int, pub si_code: c_int, - _pad: [c_int; 29], + _pad: Padding<[c_int; 29]>, _align: [usize; 0], } @@ -57,7 +57,7 @@ s! { pub l_start: off64_t, pub l_len: off64_t, pub l_pid: crate::pid_t, - __reserved: c_short, + __reserved: Padding, } pub struct stack_t { @@ -69,14 +69,14 @@ s! { pub struct stat { pub st_dev: crate::dev_t, #[cfg(not(gnu_file_offset_bits64))] - __pad1: c_ushort, + __pad1: Padding, pub st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad2: c_ushort, + __pad2: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt_t, @@ -98,7 +98,7 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad2: c_ushort, + __pad2: Padding, pub st_size: off64_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt64_t, @@ -149,12 +149,12 @@ s! { pub gid: crate::gid_t, pub cuid: crate::uid_t, pub cgid: crate::gid_t, - __pad1: c_ushort, + __pad1: Padding, pub mode: c_ushort, - __pad2: c_ushort, + __pad2: Padding, pub __seq: c_ushort, - __unused1: c_ulonglong, - __unused2: c_ulonglong, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -162,33 +162,33 @@ s! { #[cfg(gnu_time_bits64)] pub shm_segsz: size_t, #[cfg(not(gnu_time_bits64))] - __pad1: c_uint, + __pad1: Padding, pub shm_atime: crate::time_t, #[cfg(not(gnu_time_bits64))] - __pad2: c_uint, + __pad2: Padding, pub shm_dtime: crate::time_t, #[cfg(not(gnu_time_bits64))] - __pad3: c_uint, + __pad3: Padding, pub shm_ctime: crate::time_t, #[cfg(not(gnu_time_bits64))] pub shm_segsz: size_t, pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __reserved1: c_ulong, - __reserved2: c_ulong, + __reserved1: Padding, + __reserved2: Padding, } pub struct msqid_ds { pub msg_perm: crate::ipc_perm, #[cfg(not(gnu_time_bits64))] - __pad1: c_uint, + __pad1: Padding, pub msg_stime: crate::time_t, #[cfg(not(gnu_time_bits64))] - __pad2: c_uint, + __pad2: Padding, pub msg_rtime: crate::time_t, #[cfg(not(gnu_time_bits64))] - __pad3: c_uint, + __pad3: Padding, pub msg_ctime: crate::time_t, pub __msg_cbytes: c_ulong, pub msg_qnum: crate::msgqnum_t, diff --git a/src/unix/linux_like/linux/gnu/b32/x86/mod.rs b/src/unix/linux_like/linux/gnu/b32/x86/mod.rs index 4882acb8fd0e2..8c80598f84f41 100644 --- a/src/unix/linux_like/linux/gnu/b32/x86/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/x86/mod.rs @@ -108,7 +108,7 @@ s! { pub start_code: c_ulong, pub start_stack: c_ulong, pub signal: c_long, - __reserved: c_int, + __reserved: Padding, pub u_ar0: *mut user_regs_struct, pub u_fpstate: *mut user_fpregs_struct, pub magic: c_ulong, @@ -130,17 +130,17 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: c_ushort, - __pad1: c_ushort, + __pad1: Padding, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct stat64 { pub st_dev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - __pad1: c_uint, + __pad1: Padding, #[cfg(not(gnu_time_bits64))] __st_ino: c_ulong, #[cfg(gnu_time_bits64)] @@ -151,22 +151,22 @@ s! { pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, #[cfg(not(gnu_time_bits64))] - __pad2: c_uint, + __pad2: Padding, pub st_size: off64_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt64_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, #[cfg(gnu_time_bits64)] - _atime_pad: c_int, + _atime_pad: Padding, pub st_mtime: crate::time_t, pub st_mtime_nsec: c_long, #[cfg(gnu_time_bits64)] - _mtime_pad: c_int, + _mtime_pad: Padding, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, #[cfg(gnu_time_bits64)] - _ctime_pad: c_int, + _ctime_pad: Padding, #[cfg(not(gnu_time_bits64))] pub st_ino: crate::ino64_t, } @@ -207,18 +207,18 @@ s! { pub shm_segsz: size_t, pub shm_atime: crate::time_t, #[cfg(not(gnu_time_bits64))] - __unused1: c_ulong, + __unused1: Padding, pub shm_dtime: crate::time_t, #[cfg(not(gnu_time_bits64))] - __unused2: c_ulong, + __unused2: Padding, pub shm_ctime: crate::time_t, #[cfg(not(gnu_time_bits64))] - __unused3: c_ulong, + __unused3: Padding, pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct msqid_ds { @@ -272,7 +272,7 @@ s! { pub foo: c_long, pub fos: c_long, pub mxcsr: c_long, - __reserved: c_long, + __reserved: Padding, pub st_space: [c_long; 32], pub xmm_space: [c_long; 32], padding: [c_long; 56], diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs index b5af0e8ec9548..d896257046df4 100644 --- a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs @@ -20,7 +20,7 @@ s! { pub sa_sigaction: crate::sighandler_t, pub sa_mask: crate::sigset_t, #[cfg(target_arch = "sparc64")] - __reserved0: c_int, + __reserved0: Padding, pub sa_flags: c_int, pub sa_restorer: Option, } @@ -65,10 +65,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad1: crate::dev_t, + __pad1: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, - __pad2: c_int, + __pad2: Padding, pub st_blocks: crate::blkcnt_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -76,7 +76,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2], + __unused: Padding<[c_int; 2]>, } pub struct stat64 { @@ -87,10 +87,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad1: crate::dev_t, + __pad1: Padding, pub st_size: off64_t, pub st_blksize: crate::blksize_t, - __pad2: c_int, + __pad2: Padding, pub st_blocks: crate::blkcnt64_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -98,7 +98,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2], + __unused: Padding<[c_int; 2]>, } pub struct statfs64 { @@ -165,9 +165,9 @@ s! { pub cgid: crate::gid_t, pub mode: c_uint, pub __seq: c_ushort, - __pad1: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad1: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -179,8 +179,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct siginfo_t { @@ -219,7 +219,7 @@ s! { pub sp: c_ulonglong, pub pc: c_ulonglong, pub pstate: c_ulonglong, - __reserved: [u64; 512], + __reserved: Padding<[u64; 512]>, } pub struct user_fpsimd_struct { diff --git a/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs index 1eeb6098284b8..e3971eaafe0ae 100644 --- a/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs @@ -22,10 +22,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad1: crate::dev_t, + __pad1: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, - __pad2: c_int, + __pad2: Padding, pub st_blocks: crate::blkcnt_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -33,7 +33,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2], + __unused: Padding<[c_int; 2]>, } pub struct stat64 { @@ -55,7 +55,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2], + __unused: Padding<[c_int; 2]>, } pub struct statfs { @@ -176,9 +176,9 @@ s! { pub cgid: crate::gid_t, pub mode: c_uint, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -190,8 +190,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct user_regs_struct { diff --git a/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs b/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs index da43c3268813a..dfec9203361d0 100644 --- a/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs @@ -15,16 +15,16 @@ pub type __s64 = c_long; s! { pub struct stat { pub st_dev: c_ulong, - st_pad1: [c_long; 2], + st_pad1: Padding<[c_long; 2]>, pub st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: c_ulong, - st_pad2: [c_ulong; 1], + st_pad2: Padding<[c_ulong; 1]>, pub st_size: off_t, - st_pad3: c_long, + st_pad3: Padding, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, pub st_mtime: crate::time_t, @@ -32,9 +32,9 @@ s! { pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, - st_pad4: c_long, + st_pad4: Padding, pub st_blocks: crate::blkcnt_t, - st_pad5: [c_long; 7], + st_pad5: Padding<[c_long; 7]>, } pub struct statfs { @@ -70,14 +70,14 @@ s! { pub struct stat64 { pub st_dev: c_ulong, - st_pad1: [c_long; 2], + st_pad1: Padding<[c_long; 2]>, pub st_ino: crate::ino64_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: c_ulong, - st_pad2: [c_long; 2], + st_pad2: Padding<[c_long; 2]>, pub st_size: off64_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -86,9 +86,9 @@ s! { pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, - st_pad3: c_long, + st_pad3: Padding, pub st_blocks: crate::blkcnt64_t, - st_pad5: [c_long; 7], + st_pad5: Padding<[c_long; 7]>, } pub struct statfs64 { @@ -159,8 +159,8 @@ s! { pub si_signo: c_int, pub si_code: c_int, pub si_errno: c_int, - _pad: c_int, - _pad2: [c_long; 14], + _pad: Padding, + _pad2: Padding<[c_long; 14]>, } pub struct ipc_perm { @@ -171,9 +171,9 @@ s! { pub cgid: crate::gid_t, pub mode: c_uint, pub __seq: c_ushort, - __pad1: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad1: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -185,8 +185,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } } diff --git a/src/unix/linux_like/linux/gnu/b64/mod.rs b/src/unix/linux_like/linux/gnu/b64/mod.rs index ba5678b459795..5a3022117c2a3 100644 --- a/src/unix/linux_like/linux/gnu/b64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/mod.rs @@ -80,7 +80,7 @@ s! { target_arch = "sparc64", target_arch = "s390x", )))] - __reserved: crate::__syscall_ulong_t, + __reserved: Padding, pub sem_ctime: crate::time_t, #[cfg(not(any( target_arch = "aarch64", @@ -92,7 +92,7 @@ s! { target_arch = "sparc64", target_arch = "s390x", )))] - __reserved2: crate::__syscall_ulong_t, + __reserved2: Padding, pub sem_nsems: crate::__syscall_ulong_t, __glibc_reserved3: crate::__syscall_ulong_t, __glibc_reserved4: crate::__syscall_ulong_t, diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs index 153d25e2f3deb..2d6957d5e51c7 100644 --- a/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs @@ -23,7 +23,7 @@ s! { pub sa_sigaction: crate::sighandler_t, pub sa_mask: crate::sigset_t, #[cfg(target_arch = "sparc64")] - __reserved0: c_int, + __reserved0: Padding, pub sa_flags: c_int, pub sa_restorer: Option, } @@ -67,7 +67,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -78,7 +78,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_long; 3], + __unused: Padding<[c_long; 3]>, } pub struct stat64 { @@ -88,7 +88,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off64_t, pub st_blksize: crate::blksize_t, @@ -99,7 +99,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __reserved: [c_long; 3], + __reserved: Padding<[c_long; 3]>, } pub struct statfs64 { @@ -159,9 +159,9 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: u32, - __pad1: u32, - __unused1: u64, - __unused2: c_ulong, + __pad1: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -173,8 +173,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct siginfo_t { diff --git a/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs b/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs index e5546cdae7fb3..3438a510d3bf9 100644 --- a/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs @@ -40,7 +40,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2usize], + __unused: Padding<[c_int; 2usize]>, } pub struct stat64 { @@ -62,7 +62,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2], + __unused: Padding<[c_int; 2]>, } pub struct statfs { @@ -162,11 +162,11 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: c_ushort, - __pad1: c_ushort, + __pad1: Padding, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -178,8 +178,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused5: c_ulong, - __unused6: c_ulong, + __unused5: Padding, + __unused6: Padding, } pub struct flock { diff --git a/src/unix/linux_like/linux/gnu/b64/s390x.rs b/src/unix/linux_like/linux/gnu/b64/s390x.rs index a59ad99ad9256..d368f8fa4e2a3 100644 --- a/src/unix/linux_like/linux/gnu/b64/s390x.rs +++ b/src/unix/linux_like/linux/gnu/b64/s390x.rs @@ -61,8 +61,8 @@ s! { pub si_signo: c_int, pub si_errno: c_int, pub si_code: c_int, - _pad: c_int, - _pad2: [c_long; 14], + _pad: Padding, + _pad2: Padding<[c_long; 14]>, } pub struct stack_t { @@ -78,7 +78,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - st_pad0: c_int, + st_pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_atime: crate::time_t, @@ -99,7 +99,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - st_pad0: c_int, + st_pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_atime: crate::time_t, @@ -125,9 +125,9 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_ushort, - __pad1: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad1: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -139,8 +139,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct statvfs { @@ -165,7 +165,7 @@ s! { pub struct fpregset_t { pub fpc: u32, - __pad: u32, + __pad: Padding, pub fprs: [fpreg_t; 16], } diff --git a/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs b/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs index 0a40d7599bad9..0b32562339690 100644 --- a/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs @@ -21,7 +21,7 @@ s! { pub sa_sigaction: crate::sighandler_t, pub sa_mask: crate::sigset_t, #[cfg(target_arch = "sparc64")] - __reserved0: c_int, + __reserved0: Padding, pub sa_flags: c_int, pub sa_restorer: Option, } @@ -71,7 +71,7 @@ s! { pub l_start: off64_t, pub l_len: off64_t, pub l_pid: crate::pid_t, - __reserved: c_short, + __reserved: Padding, } pub struct stack_t { @@ -82,14 +82,14 @@ s! { pub struct stat { pub st_dev: crate::dev_t, - __pad0: u64, + __pad0: Padding, pub st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad1: u64, + __pad1: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt_t, @@ -99,19 +99,19 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_long; 2], + __unused: Padding<[c_long; 2]>, } pub struct stat64 { pub st_dev: crate::dev_t, - __pad0: u64, + __pad0: Padding, pub st_ino: crate::ino64_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad2: c_int, + __pad2: Padding, pub st_size: off64_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt64_t, @@ -121,7 +121,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __reserved: [c_long; 2], + __reserved: Padding<[c_long; 2]>, } pub struct statfs64 { @@ -180,10 +180,10 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: crate::mode_t, - __pad0: u16, + __pad0: Padding, pub __seq: c_ushort, - __unused1: c_ulonglong, - __unused2: c_ulonglong, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -195,8 +195,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __reserved1: c_ulong, - __reserved2: c_ulong, + __reserved1: Padding, + __reserved2: Padding, } } diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs index f58d8bba480f8..8654559b148fb 100644 --- a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs @@ -21,7 +21,7 @@ s! { pub sa_sigaction: crate::sighandler_t, pub sa_mask: crate::sigset_t, #[cfg(target_arch = "sparc64")] - __reserved0: c_int, + __reserved0: Padding, pub sa_flags: c_int, pub sa_restorer: Option, } @@ -86,7 +86,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -97,7 +97,7 @@ s! { pub st_mtime_nsec: i64, pub st_ctime: crate::time_t, pub st_ctime_nsec: i64, - __unused: [i64; 3], + __unused: Padding<[i64; 3]>, } pub struct stat64 { @@ -107,7 +107,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -118,7 +118,7 @@ s! { pub st_mtime_nsec: i64, pub st_ctime: crate::time_t, pub st_ctime_nsec: i64, - __reserved: [i64; 3], + __reserved: Padding<[i64; 3]>, } pub struct statfs64 { @@ -222,12 +222,12 @@ s! { pub start_code: c_ulonglong, pub start_stack: c_ulonglong, pub signal: c_longlong, - __reserved: c_int, + __reserved: Padding, #[cfg(target_pointer_width = "32")] - __pad1: u32, + __pad1: Padding, pub u_ar0: *mut user_regs_struct, #[cfg(target_pointer_width = "32")] - __pad2: u32, + __pad2: Padding, pub u_fpstate: *mut user_fpregs_struct, pub magic: c_ulonglong, pub u_comm: [c_char; 32], @@ -247,11 +247,11 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: c_ushort, - __pad1: c_ushort, + __pad1: Padding, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: u64, - __unused2: u64, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -263,8 +263,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: u64, - __unused5: u64, + __unused4: Padding, + __unused5: Padding, } pub struct ptrace_rseq_configuration { diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs index de524d670ef8d..6a265560ddd40 100644 --- a/src/unix/linux_like/linux/gnu/mod.rs +++ b/src/unix/linux_like/linux/gnu/mod.rs @@ -35,11 +35,11 @@ s! { pub gl_offs: size_t, pub gl_flags: c_int, - __unused1: *mut c_void, - __unused2: *mut c_void, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, } pub struct msghdr { @@ -320,13 +320,13 @@ s! { pub struct timespec { pub tv_sec: time_t, #[cfg(all(gnu_time_bits64, target_endian = "big"))] - __pad: i32, + __pad: Padding, #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))] pub tv_nsec: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] pub tv_nsec: i64, #[cfg(all(gnu_time_bits64, target_endian = "little"))] - __pad: i32, + __pad: Padding, } pub struct utmpx { @@ -420,7 +420,7 @@ s_no_extra_traits! { not(target_arch = "x86_64"), target_pointer_width = "32" ))] - __pad: [c_char; 4], + __pad: Padding<[c_char; 4]>, __glibc_reserved: [c_char; 32], } diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index 2f638ae8def3c..3c51650f14617 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -104,11 +104,11 @@ s! { pub gl_offs: size_t, pub gl_flags: c_int, - __unused1: *mut c_void, - __unused2: *mut c_void, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, } pub struct passwd { @@ -163,11 +163,11 @@ s! { pub ssi_stime: u64, pub ssi_addr: u64, pub ssi_addr_lsb: u16, - _pad2: u16, + _pad2: Padding, pub ssi_syscall: i32, pub ssi_call_addr: u64, pub ssi_arch: u32, - _pad: [u8; 28], + _pad: Padding<[u8; 28]>, } pub struct itimerspec { @@ -642,7 +642,7 @@ s! { __allocated: c_int, __used: c_int, __actions: *mut c_int, - __pad: [c_int; 16], + __pad: Padding<[c_int; 16]>, } pub struct posix_spawnattr_t { @@ -655,7 +655,7 @@ s! { #[cfg(not(any(target_env = "musl", target_env = "ohos")))] __sp: crate::sched_param, __policy: c_int, - __pad: [c_int; 16], + __pad: Padding<[c_int; 16]>, } pub struct genlmsghdr { @@ -1369,7 +1369,7 @@ s! { pub struct sockaddr_nl { pub nl_family: crate::sa_family_t, - nl_pad: c_ushort, + nl_pad: Padding, pub nl_pid: u32, pub nl_groups: u32, } diff --git a/src/unix/linux_like/linux/musl/b32/arm/mod.rs b/src/unix/linux_like/linux/musl/b32/arm/mod.rs index 02fe6d6294a47..8051e6cf8253b 100644 --- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs +++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs @@ -70,41 +70,41 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_int, - __unused1: c_long, - __unused2: c_long, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { pub shm_perm: crate::ipc_perm, pub shm_segsz: size_t, pub shm_atime: crate::time_t, - __unused1: c_int, + __unused1: Padding, pub shm_dtime: crate::time_t, - __unused2: c_int, + __unused2: Padding, pub shm_ctime: crate::time_t, - __unused3: c_int, + __unused3: Padding, pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: c_ulong, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct msqid_ds { pub msg_perm: crate::ipc_perm, pub msg_stime: crate::time_t, - __unused1: c_int, + __unused1: Padding, pub msg_rtime: crate::time_t, - __unused2: c_int, + __unused2: Padding, pub msg_ctime: crate::time_t, - __unused3: c_int, + __unused3: Padding, pub __msg_cbytes: c_ulong, pub msg_qnum: crate::msgqnum_t, pub msg_qbytes: crate::msglen_t, pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct mcontext_t { diff --git a/src/unix/linux_like/linux/musl/b32/hexagon.rs b/src/unix/linux_like/linux/musl/b32/hexagon.rs index 1c29114338adb..54bfbda97ed5c 100644 --- a/src/unix/linux_like/linux/musl/b32/hexagon.rs +++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs @@ -24,7 +24,7 @@ s! { pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2], + __unused: Padding<[c_int; 2]>, } pub struct stack_t { @@ -55,33 +55,33 @@ s! { pub shm_perm: crate::ipc_perm, pub shm_segsz: size_t, pub shm_atime: crate::time_t, - __unused1: c_int, + __unused1: Padding, pub shm_dtime: crate::time_t, - __unused2: c_int, + __unused2: Padding, pub shm_ctime: crate::time_t, - __unused3: c_int, + __unused3: Padding, pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: c_ulong, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct msqid_ds { pub msg_perm: crate::ipc_perm, pub msg_stime: crate::time_t, - __unused1: c_int, + __unused1: Padding, pub msg_rtime: crate::time_t, - __unused2: c_int, + __unused2: Padding, pub msg_ctime: crate::time_t, - __unused3: c_int, + __unused3: Padding, pub __msg_cbytes: c_ulong, pub msg_qnum: crate::msgqnum_t, pub msg_qbytes: crate::msglen_t, pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } } diff --git a/src/unix/linux_like/linux/musl/b32/mips/mod.rs b/src/unix/linux_like/linux/musl/b32/mips/mod.rs index d8c3ee9d54736..d563c5e420a12 100644 --- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs +++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs @@ -6,14 +6,14 @@ pub type wchar_t = c_int; s! { pub struct stat { pub st_dev: crate::dev_t, - __st_padding1: [c_long; 2], + __st_padding1: Padding<[c_long; 2]>, pub st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __st_padding2: [c_long; 2], + __st_padding2: Padding<[c_long; 2]>, pub st_size: off_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -22,21 +22,21 @@ s! { pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, - __st_padding3: c_long, + __st_padding3: Padding, pub st_blocks: crate::blkcnt_t, - __st_padding4: [c_long; 14], + __st_padding4: Padding<[c_long; 14]>, } pub struct stat64 { pub st_dev: crate::dev_t, - __st_padding1: [c_long; 2], + __st_padding1: Padding<[c_long; 2]>, pub st_ino: crate::ino64_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __st_padding2: [c_long; 2], + __st_padding2: Padding<[c_long; 2]>, pub st_size: off_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -45,9 +45,9 @@ s! { pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, - __st_padding3: c_long, + __st_padding3: Padding, pub st_blocks: crate::blkcnt64_t, - __st_padding4: [c_long; 14], + __st_padding4: Padding<[c_long; 14]>, } pub struct stack_t { @@ -72,8 +72,8 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_int, - __unused1: c_long, - __unused2: c_long, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -85,34 +85,34 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: c_ulong, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct msqid_ds { pub msg_perm: crate::ipc_perm, #[cfg(target_endian = "big")] - __unused1: c_int, + __unused1: Padding, pub msg_stime: crate::time_t, #[cfg(target_endian = "little")] - __unused1: c_int, + __unused1: Padding, #[cfg(target_endian = "big")] - __unused2: c_int, + __unused2: Padding, pub msg_rtime: crate::time_t, #[cfg(target_endian = "little")] - __unused2: c_int, + __unused2: Padding, #[cfg(target_endian = "big")] - __unused3: c_int, + __unused3: Padding, pub msg_ctime: crate::time_t, #[cfg(target_endian = "little")] - __unused3: c_int, + __unused3: Padding, pub __msg_cbytes: c_ulong, pub msg_qnum: crate::msgqnum_t, pub msg_qbytes: crate::msglen_t, pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct statfs { diff --git a/src/unix/linux_like/linux/musl/b32/powerpc.rs b/src/unix/linux_like/linux/musl/b32/powerpc.rs index 60305b3041013..984c88b86d143 100644 --- a/src/unix/linux_like/linux/musl/b32/powerpc.rs +++ b/src/unix/linux_like/linux/musl/b32/powerpc.rs @@ -33,7 +33,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_long; 2], + __unused: Padding<[c_long; 2]>, } pub struct stat64 { @@ -54,7 +54,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_long; 2], + __unused: Padding<[c_long; 2]>, } pub struct stack_t { @@ -79,43 +79,43 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_int, - __pad1: c_int, - __pad2: c_longlong, - __pad3: c_longlong, + __pad1: Padding, + __pad2: Padding, + __pad3: Padding, } pub struct shmid_ds { pub shm_perm: crate::ipc_perm, - __unused1: c_int, + __unused1: Padding, pub shm_atime: crate::time_t, - __unused2: c_int, + __unused2: Padding, pub shm_dtime: crate::time_t, - __unused3: c_int, + __unused3: Padding, pub shm_ctime: crate::time_t, - __unused4: c_int, + __unused4: Padding, pub shm_segsz: size_t, pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: c_ulong, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct msqid_ds { pub msg_perm: crate::ipc_perm, - __unused1: c_int, + __unused1: Padding, pub msg_stime: crate::time_t, - __unused2: c_int, + __unused2: Padding, pub msg_rtime: crate::time_t, - __unused3: c_int, + __unused3: Padding, pub msg_ctime: crate::time_t, pub __msg_cbytes: c_ulong, pub msg_qnum: crate::msgqnum_t, pub msg_qbytes: crate::msglen_t, pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } } diff --git a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs index 04ecf1b46c42d..4237c579a1a7f 100644 --- a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs +++ b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs @@ -28,7 +28,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2usize], + __unused: Padding<[c_int; 2usize]>, } pub struct stat64 { @@ -50,7 +50,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2], + __unused: Padding<[c_int; 2]>, } pub struct stack_t { @@ -66,11 +66,11 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: c_ushort, - __pad1: c_ushort, + __pad1: Padding, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -82,25 +82,25 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused5: c_ulong, - __unused6: c_ulong, + __unused5: Padding, + __unused6: Padding, } pub struct msqid_ds { pub msg_perm: crate::ipc_perm, pub msg_stime: crate::time_t, - __unused1: c_int, + __unused1: Padding, pub msg_rtime: crate::time_t, - __unused2: c_int, + __unused2: Padding, pub msg_ctime: crate::time_t, - __unused3: c_int, + __unused3: Padding, pub __msg_cbytes: c_ulong, pub msg_qnum: crate::msgqnum_t, pub msg_qbytes: crate::msglen_t, pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } } diff --git a/src/unix/linux_like/linux/musl/b32/x86/mod.rs b/src/unix/linux_like/linux/musl/b32/x86/mod.rs index 5b7a3e8d10984..c51614240dbc3 100644 --- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs +++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs @@ -74,41 +74,41 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_int, - __unused1: c_long, - __unused2: c_long, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { pub shm_perm: crate::ipc_perm, pub shm_segsz: size_t, pub shm_atime: crate::time_t, - __unused1: c_int, + __unused1: Padding, pub shm_dtime: crate::time_t, - __unused2: c_int, + __unused2: Padding, pub shm_ctime: crate::time_t, - __unused3: c_int, + __unused3: Padding, pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: c_ulong, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct msqid_ds { pub msg_perm: crate::ipc_perm, pub msg_stime: crate::time_t, - __unused1: c_int, + __unused1: Padding, pub msg_rtime: crate::time_t, - __unused2: c_int, + __unused2: Padding, pub msg_ctime: crate::time_t, - __unused3: c_int, + __unused3: Padding, pub __msg_cbytes: c_ulong, pub msg_qnum: crate::msgqnum_t, pub msg_qbytes: crate::msglen_t, pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct user_fpxregs_struct { @@ -121,7 +121,7 @@ s! { pub foo: c_long, pub fos: c_long, pub mxcsr: c_long, - __reserved: c_long, + __reserved: Padding, pub st_space: [c_long; 32], pub xmm_space: [c_long; 32], padding: [c_long; 56], diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs index 087e39001e84f..cc52a179e7203 100644 --- a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs @@ -16,10 +16,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad0: c_ulong, + __pad0: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, - __pad1: c_int, + __pad1: Padding, pub st_blocks: crate::blkcnt_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -27,7 +27,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_uint; 2], + __unused: Padding<[c_uint; 2]>, } pub struct stat64 { @@ -38,10 +38,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad0: c_ulong, + __pad0: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, - __pad1: c_int, + __pad1: Padding, pub st_blocks: crate::blkcnt_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -49,7 +49,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_uint; 2], + __unused: Padding<[c_uint; 2]>, } pub struct user_regs_struct { @@ -84,8 +84,8 @@ s! { we'll follow that change in the future release." )] pub __seq: c_ushort, - __unused1: c_long, - __unused2: c_long, + __unused1: Padding, + __unused2: Padding, } pub struct ucontext_t { @@ -103,7 +103,7 @@ s! { pub sp: c_ulong, pub pc: c_ulong, pub pstate: c_ulong, - __reserved: [u64; 512], + __reserved: Padding<[u64; 512]>, } #[repr(align(8))] diff --git a/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs index c151b0ec32046..e973370a80c88 100644 --- a/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs @@ -22,10 +22,10 @@ s! { pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad1: crate::dev_t, + __pad1: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, - __pad2: c_int, + __pad2: Padding, pub st_blocks: crate::blkcnt_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -33,7 +33,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2usize], + __unused: Padding<[c_int; 2usize]>, } pub struct stat64 { @@ -55,7 +55,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2], + __unused: Padding<[c_int; 2]>, } pub struct ipc_perm { @@ -66,8 +66,8 @@ s! { pub cgid: crate::gid_t, pub mode: c_uint, pub __seq: c_int, - __unused1: c_ulong, - __unused2: c_ulong, + __unused1: Padding, + __unused2: Padding, } pub struct user_regs_struct { diff --git a/src/unix/linux_like/linux/musl/b64/mips64.rs b/src/unix/linux_like/linux/musl/b64/mips64.rs index 4d40637c0cb99..9626e3db78b8e 100644 --- a/src/unix/linux_like/linux/musl/b64/mips64.rs +++ b/src/unix/linux_like/linux/musl/b64/mips64.rs @@ -10,16 +10,16 @@ pub type blksize_t = i64; s! { pub struct stat { pub st_dev: crate::dev_t, - __pad1: [c_int; 3], + __pad1: Padding<[c_int; 3]>, pub st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad2: [c_uint; 2], + __pad2: Padding<[c_uint; 2]>, pub st_size: off_t, - __pad3: c_int, + __pad3: Padding, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, pub st_mtime: crate::time_t, @@ -27,23 +27,23 @@ s! { pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, - __pad4: c_uint, + __pad4: Padding, pub st_blocks: crate::blkcnt_t, - __pad5: [c_int; 14], + __pad5: Padding<[c_int; 14]>, } pub struct stat64 { pub st_dev: crate::dev_t, - __pad1: [c_int; 3], + __pad1: Padding<[c_int; 3]>, pub st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - __pad2: [c_uint; 2], + __pad2: Padding<[c_uint; 2]>, pub st_size: off_t, - __pad3: c_int, + __pad3: Padding, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, pub st_mtime: crate::time_t, @@ -51,9 +51,9 @@ s! { pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, - __pad4: c_uint, + __pad4: Padding, pub st_blocks: crate::blkcnt_t, - __pad5: [c_int; 14], + __pad5: Padding<[c_int; 14]>, } pub struct stack_t { @@ -78,9 +78,9 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_int, - __pad1: c_int, - __unused1: c_ulong, - __unused2: c_ulong, + __pad1: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct statfs { diff --git a/src/unix/linux_like/linux/musl/b64/mod.rs b/src/unix/linux_like/linux/musl/b64/mod.rs index 35545402d11d1..6365dbece4578 100644 --- a/src/unix/linux_like/linux/musl/b64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/mod.rs @@ -30,8 +30,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: c_ulong, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct msqid_ds { @@ -44,8 +44,8 @@ s! { pub msg_qbytes: crate::msglen_t, pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, - __pad1: c_ulong, - __pad2: c_ulong, + __pad1: Padding, + __pad2: Padding, } pub struct sem_t { diff --git a/src/unix/linux_like/linux/musl/b64/powerpc64.rs b/src/unix/linux_like/linux/musl/b64/powerpc64.rs index 34d56192a585a..dbf20c565e438 100644 --- a/src/unix/linux_like/linux/musl/b64/powerpc64.rs +++ b/src/unix/linux_like/linux/musl/b64/powerpc64.rs @@ -26,7 +26,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -37,7 +37,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_long; 3], + __unused: Padding<[c_long; 3]>, } pub struct stat64 { @@ -47,7 +47,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -58,7 +58,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __reserved: [c_long; 3], + __reserved: Padding<[c_long; 3]>, } pub struct shmid_ds { @@ -70,7 +70,7 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: c_ulong, - __unused: [c_ulong; 2], + __unused: Padding<[c_ulong; 2]>, } pub struct ipc_perm { @@ -89,8 +89,8 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_int, - __unused1: c_long, - __unused2: c_long, + __unused1: Padding, + __unused2: Padding, } } diff --git a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs index 29e950cc372f9..b987f8358b365 100644 --- a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs @@ -33,7 +33,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2usize], + __unused: Padding<[c_int; 2usize]>, } pub struct stat64 { @@ -55,7 +55,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_int; 2], + __unused: Padding<[c_int; 2]>, } pub struct ipc_perm { @@ -65,11 +65,11 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: c_ushort, - __pad1: c_ushort, + __pad1: Padding, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } #[repr(align(8))] diff --git a/src/unix/linux_like/linux/musl/b64/s390x.rs b/src/unix/linux_like/linux/musl/b64/s390x.rs index c0332205a7948..a7c4cb5d95f9c 100644 --- a/src/unix/linux_like/linux/musl/b64/s390x.rs +++ b/src/unix/linux_like/linux/musl/b64/s390x.rs @@ -26,8 +26,8 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_int, - __pad1: c_long, - __pad2: c_long, + __pad1: Padding, + __pad2: Padding, } pub struct stat { @@ -47,7 +47,7 @@ s! { pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt_t, - __unused: [c_long; 3], + __unused: Padding<[c_long; 3]>, } pub struct stat64 { @@ -67,7 +67,7 @@ s! { pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt64_t, - __unused: [c_long; 3], + __unused: Padding<[c_long; 3]>, } pub struct statfs { diff --git a/src/unix/linux_like/linux/musl/b64/wasm32/mod.rs b/src/unix/linux_like/linux/musl/b64/wasm32/mod.rs index 903bd48a37323..d4d0fe69839b3 100644 --- a/src/unix/linux_like/linux/musl/b64/wasm32/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/wasm32/mod.rs @@ -17,7 +17,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -28,7 +28,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_long; 3], + __unused: Padding<[c_long; 3]>, } pub struct stat64 { @@ -38,7 +38,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -49,7 +49,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __reserved: [c_long; 3], + __reserved: Padding<[c_long; 3]>, } pub struct ipc_perm { @@ -68,8 +68,8 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_int, - __unused1: c_long, - __unused2: c_long, + __unused1: Padding, + __unused2: Padding, } } diff --git a/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs index 2ad8eb774ded8..364e16b5c9257 100644 --- a/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs @@ -16,7 +16,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -27,7 +27,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused: [c_long; 3], + __unused: Padding<[c_long; 3]>, } pub struct stat64 { @@ -37,7 +37,7 @@ s! { pub st_mode: crate::mode_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, - __pad0: c_int, + __pad0: Padding, pub st_rdev: crate::dev_t, pub st_size: off_t, pub st_blksize: crate::blksize_t, @@ -48,7 +48,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __reserved: [c_long; 3], + __reserved: Padding<[c_long; 3]>, } pub struct user_regs_struct { @@ -91,12 +91,12 @@ s! { pub start_code: c_ulong, pub start_stack: c_ulong, pub signal: c_long, - __reserved: c_int, + __reserved: Padding, #[cfg(target_pointer_width = "32")] - __pad1: u32, + __pad1: Padding, pub u_ar0: *mut user_regs_struct, #[cfg(target_pointer_width = "32")] - __pad2: u32, + __pad2: Padding, pub u_fpstate: *mut user_fpregs_struct, pub magic: c_ulong, pub u_comm: [c_char; 32], @@ -127,8 +127,8 @@ s! { pub cgid: crate::gid_t, pub mode: crate::mode_t, pub __seq: c_int, - __unused1: c_long, - __unused2: c_long, + __unused1: Padding, + __unused2: Padding, } #[repr(align(8))] diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs index 50ae72f7e1f29..17dd00fa79e50 100644 --- a/src/unix/linux_like/linux/musl/mod.rs +++ b/src/unix/linux_like/linux/musl/mod.rs @@ -168,7 +168,7 @@ s! { #[cfg(target_endian = "little")] pub f_fsid: c_ulong, #[cfg(target_pointer_width = "32")] - __pad: c_int, + __pad: Padding, #[cfg(target_endian = "big")] pub f_fsid: c_ulong, pub f_flag: c_ulong, @@ -188,7 +188,7 @@ s! { #[cfg(target_endian = "little")] pub f_fsid: c_ulong, #[cfg(target_pointer_width = "32")] - __pad: c_int, + __pad: Padding, #[cfg(target_endian = "big")] pub f_fsid: c_ulong, pub f_flag: c_ulong, @@ -228,7 +228,7 @@ s! { pub struct regex_t { __re_nsub: size_t, __opaque: *mut c_void, - __padding: [*mut c_void; 4usize], + __padding: Padding<[*mut c_void; 4usize]>, __nsub2: size_t, __padding2: c_char, } @@ -418,7 +418,7 @@ s! { pub struct utmpx { pub ut_type: c_short, - __ut_pad1: c_short, + __ut_pad1: Padding, pub ut_pid: crate::pid_t, pub ut_line: [c_char; 32], pub ut_id: [c_char; 4], @@ -436,18 +436,18 @@ s! { #[cfg(musl_v1_2_3)] #[cfg(not(target_endian = "little"))] - __ut_pad2: c_int, + __ut_pad2: Padding, #[cfg(musl_v1_2_3)] pub ut_session: c_int, #[cfg(musl_v1_2_3)] #[cfg(target_endian = "little")] - __ut_pad2: c_int, + __ut_pad2: Padding, pub ut_tv: crate::timeval, pub ut_addr_v6: [c_uint; 4], - __unused: [c_char; 20], + __unused: Padding<[c_char; 20]>, } } diff --git a/src/unix/linux_like/linux/uclibc/arm/mod.rs b/src/unix/linux_like/linux/uclibc/arm/mod.rs index c54d77b194c48..7052d9daac2d2 100644 --- a/src/unix/linux_like/linux/uclibc/arm/mod.rs +++ b/src/unix/linux_like/linux/uclibc/arm/mod.rs @@ -44,14 +44,14 @@ s! { pub struct stat { pub st_dev: c_ulonglong, - __pad1: c_ushort, + __pad1: Padding, pub st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: c_ulonglong, - __pad2: c_ushort, + __pad2: Padding, pub st_size: off_t, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt_t, @@ -61,8 +61,8 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct stat64 { @@ -203,44 +203,44 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: c_ushort, - __pad1: c_ushort, + __pad1: Padding, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct msqid_ds { pub msg_perm: crate::ipc_perm, pub msg_stime: crate::time_t, - __unused1: c_ulong, + __unused1: Padding, pub msg_rtime: crate::time_t, - __unused2: c_ulong, + __unused2: Padding, pub msg_ctime: crate::time_t, - __unused3: c_ulong, + __unused3: Padding, pub __msg_cbytes: c_ulong, pub msg_qnum: crate::msgqnum_t, pub msg_qbytes: crate::msglen_t, pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct shmid_ds { pub shm_perm: crate::ipc_perm, pub shm_segsz: size_t, pub shm_atime: crate::time_t, - __unused1: c_ulong, + __unused1: Padding, pub shm_dtime: crate::time_t, - __unused2: c_ulong, + __unused2: Padding, pub shm_ctime: crate::time_t, - __unused3: c_ulong, + __unused3: Padding, pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } // FIXME(1.0) this is actually a union diff --git a/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs b/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs index 7dd0440907855..56137bdc38e6d 100644 --- a/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs +++ b/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs @@ -20,7 +20,7 @@ pub type fsfilcnt64_t = u64; s! { pub struct stat { pub st_dev: crate::dev_t, - st_pad1: [c_long; 2], + st_pad1: Padding<[c_long; 2]>, pub st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, @@ -29,7 +29,7 @@ s! { pub st_rdev: crate::dev_t, pub st_pad2: [c_long; 1], pub st_size: off_t, - st_pad3: c_long, + st_pad3: Padding, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, pub st_mtime: crate::time_t, @@ -38,19 +38,19 @@ s! { pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt_t, - st_pad5: [c_long; 14], + st_pad5: Padding<[c_long; 14]>, } pub struct stat64 { pub st_dev: crate::dev_t, - st_pad1: [c_long; 2], + st_pad1: Padding<[c_long; 2]>, pub st_ino: crate::ino64_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, - st_pad2: [c_long; 2], + st_pad2: Padding<[c_long; 2]>, pub st_size: off64_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -59,9 +59,9 @@ s! { pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, - st_pad3: c_long, + st_pad3: Padding, pub st_blocks: crate::blkcnt64_t, - st_pad5: [c_long; 14], + st_pad5: Padding<[c_long; 14]>, } pub struct statvfs64 { @@ -114,11 +114,11 @@ s! { pub gl_offs: size_t, pub gl_flags: c_int, - __unused1: *mut c_void, - __unused2: *mut c_void, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, } pub struct ipc_perm { @@ -129,9 +129,9 @@ s! { pub cgid: crate::gid_t, pub mode: c_uint, pub __seq: c_ushort, - __pad1: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad1: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -143,8 +143,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct msqid_ds { diff --git a/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs b/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs index 39eb0242730d8..b6adb637493bb 100644 --- a/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs +++ b/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs @@ -15,16 +15,16 @@ pub type wchar_t = i32; s! { pub struct stat { pub st_dev: c_ulong, - st_pad1: [c_long; 2], + st_pad1: Padding<[c_long; 2]>, pub st_ino: crate::ino_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: c_ulong, - st_pad2: [c_ulong; 1], + st_pad2: Padding<[c_ulong; 1]>, pub st_size: off_t, - st_pad3: c_long, + st_pad3: Padding, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, pub st_mtime: crate::time_t, @@ -32,21 +32,21 @@ s! { pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, - st_pad4: c_long, + st_pad4: Padding, pub st_blocks: crate::blkcnt_t, - st_pad5: [c_long; 7], + st_pad5: Padding<[c_long; 7]>, } pub struct stat64 { pub st_dev: c_ulong, - st_pad1: [c_long; 2], + st_pad1: Padding<[c_long; 2]>, pub st_ino: crate::ino64_t, pub st_mode: crate::mode_t, pub st_nlink: crate::nlink_t, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: c_ulong, - st_pad2: [c_long; 2], + st_pad2: Padding<[c_long; 2]>, pub st_size: off64_t, pub st_atime: crate::time_t, pub st_atime_nsec: c_long, @@ -55,9 +55,9 @@ s! { pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, pub st_blksize: crate::blksize_t, - st_pad3: c_long, + st_pad3: Padding, pub st_blocks: crate::blkcnt64_t, - st_pad5: [c_long; 7], + st_pad5: Padding<[c_long; 7]>, } pub struct pthread_attr_t { @@ -85,8 +85,8 @@ s! { pub si_signo: c_int, pub si_code: c_int, pub si_errno: c_int, - _pad: c_int, - _pad2: [c_long; 14], + _pad: Padding, + _pad2: Padding<[c_long; 14]>, } pub struct ipc_perm { @@ -97,9 +97,9 @@ s! { pub cgid: crate::gid_t, pub mode: c_uint, pub __seq: c_ushort, - __pad1: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad1: Padding, + __unused1: Padding, + __unused2: Padding, } pub struct shmid_ds { @@ -111,8 +111,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused4: c_ulong, - __unused5: c_ulong, + __unused4: Padding, + __unused5: Padding, } pub struct msqid_ds { diff --git a/src/unix/linux_like/linux/uclibc/x86_64/mod.rs b/src/unix/linux_like/linux/uclibc/x86_64/mod.rs index 9b422433d5230..885d8ef477a0e 100644 --- a/src/unix/linux_like/linux/uclibc/x86_64/mod.rs +++ b/src/unix/linux_like/linux/uclibc/x86_64/mod.rs @@ -31,11 +31,11 @@ s! { pub cuid: crate::uid_t, pub cgid: crate::gid_t, pub mode: c_ushort, // read / write - __pad1: c_ushort, + __pad1: Padding, pub __seq: c_ushort, - __pad2: c_ushort, - __unused1: c_ulong, - __unused2: c_ulong, + __pad2: Padding, + __unused1: Padding, + __unused2: Padding, } #[cfg(not(target_os = "l4re"))] @@ -72,8 +72,8 @@ s! { pub shm_cpid: crate::pid_t, pub shm_lpid: crate::pid_t, pub shm_nattch: crate::shmatt_t, - __unused1: c_ulong, - __unused2: c_ulong, + __unused1: Padding, + __unused2: Padding, } pub struct msqid_ds { @@ -129,7 +129,7 @@ s! { pub st_mtime_nsec: c_ulong, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_ulong, - st_pad4: [c_long; 3], + st_pad4: Padding<[c_long; 3]>, } // FIXME(1.0): This should not implement `PartialEq` @@ -244,11 +244,11 @@ s! { pub gl_pathv: *mut *mut c_char, pub gl_offs: size_t, pub gl_flags: c_int, - __unused1: *mut c_void, - __unused2: *mut c_void, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, } pub struct cpu_set_t { diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs index 4545f90f0f54c..e0198f16c5b5d 100644 --- a/src/unix/linux_like/mod.rs +++ b/src/unix/linux_like/mod.rs @@ -277,7 +277,7 @@ cfg_if! { pub stx_uid: crate::__u32, pub stx_gid: crate::__u32, pub stx_mode: crate::__u16, - __statx_pad1: [crate::__u16; 1], + __statx_pad1: Padding<[crate::__u16; 1]>, pub stx_ino: crate::__u64, pub stx_size: crate::__u64, pub stx_blocks: crate::__u64, @@ -293,13 +293,13 @@ cfg_if! { pub stx_mnt_id: crate::__u64, pub stx_dio_mem_align: crate::__u32, pub stx_dio_offset_align: crate::__u32, - __statx_pad3: [crate::__u64; 12], + __statx_pad3: Padding<[crate::__u64; 12]>, } pub struct statx_timestamp { pub tv_sec: crate::__s64, pub tv_nsec: crate::__u32, - __statx_timestamp_pad1: [crate::__s32; 1], + __statx_timestamp_pad1: Padding<[crate::__s32; 1]>, } } } @@ -323,7 +323,7 @@ s_no_extra_traits! { } pub union __c_anonymous_sigev_un { - _pad: [c_int; SIGEV_PAD_SIZE], + _pad: Padding<[c_int; SIGEV_PAD_SIZE]>, pub _tid: c_int, pub _sigev_thread: __c_anonymous_sigev_thread, } diff --git a/src/unix/mod.rs b/src/unix/mod.rs index c3c65d0864838..d147a247c847f 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -88,49 +88,49 @@ s! { pub ru_stime: timeval, pub ru_maxrss: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad1: u32, + __pad1: Padding, pub ru_ixrss: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad2: u32, + __pad2: Padding, pub ru_idrss: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad3: u32, + __pad3: Padding, pub ru_isrss: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad4: u32, + __pad4: Padding, pub ru_minflt: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad5: u32, + __pad5: Padding, pub ru_majflt: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad6: u32, + __pad6: Padding, pub ru_nswap: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad7: u32, + __pad7: Padding, pub ru_inblock: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad8: u32, + __pad8: Padding, pub ru_oublock: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad9: u32, + __pad9: Padding, pub ru_msgsnd: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad10: u32, + __pad10: Padding, pub ru_msgrcv: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad11: u32, + __pad11: Padding, pub ru_nsignals: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad12: u32, + __pad12: Padding, pub ru_nvcsw: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad13: u32, + __pad13: Padding, pub ru_nivcsw: c_long, #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] - __pad14: u32, + __pad14: Padding, #[cfg(any(target_env = "musl", target_env = "ohos", target_os = "emscripten"))] - __reserved: [c_long; 16], + __reserved: Padding<[c_long; 16]>, } #[cfg(not(target_os = "nuttx"))] diff --git a/src/unix/newlib/vita/mod.rs b/src/unix/newlib/vita/mod.rs index 62cd300e1d6f0..2a456f47363d9 100644 --- a/src/unix/newlib/vita/mod.rs +++ b/src/unix/newlib/vita/mod.rs @@ -82,7 +82,7 @@ s! { pub struct dirent { __offset: [u8; 88], pub d_name: [c_char; 256usize], - __pad: [u8; 8], + __pad: Padding<[u8; 8]>, } } diff --git a/src/unix/nto/mod.rs b/src/unix/nto/mod.rs index 64f57270463d6..69b835d68c094 100644 --- a/src/unix/nto/mod.rs +++ b/src/unix/nto/mod.rs @@ -316,11 +316,11 @@ s! { pub gl_flags: c_int, pub gl_errfunc: extern "C" fn(*const c_char, c_int) -> c_int, - __unused1: *mut c_void, - __unused2: *mut c_void, - __unused3: *mut c_void, - __unused4: *mut c_void, - __unused5: *mut c_void, + __unused1: Padding<*mut c_void>, + __unused2: Padding<*mut c_void>, + __unused3: Padding<*mut c_void>, + __unused4: Padding<*mut c_void>, + __unused5: Padding<*mut c_void>, } pub struct passwd { @@ -485,7 +485,7 @@ s! { pub c_cflag: crate::tcflag_t, pub c_lflag: crate::tcflag_t, pub c_cc: [crate::cc_t; crate::NCCS], - __reserved: [c_uint; 3], + __reserved: Padding<[c_uint; 3]>, pub c_ispeed: crate::speed_t, pub c_ospeed: crate::speed_t, } @@ -538,7 +538,7 @@ s! { pub aio_sigevent: crate::sigevent, pub aio_lio_opcode: c_int, pub _aio_lio_state: *mut c_void, - _aio_pad: [c_int; 3], + _aio_pad: Padding<[c_int; 3]>, pub _aio_next: *mut crate::aiocb, pub _aio_flag: c_uint, pub _aio_iotype: c_uint, @@ -593,7 +593,7 @@ s! { pub __prioceiling: c_int, pub __clockid: c_int, pub __count: c_int, - __reserved: [c_int; 3], + __reserved: Padding<[c_int; 3]>, } pub struct sockcred { @@ -679,9 +679,9 @@ s! { pub struct sockaddr_storage { pub ss_len: u8, pub ss_family: sa_family_t, - __ss_pad1: [c_char; 6], + __ss_pad1: Padding<[c_char; 6]>, __ss_align: i64, - __ss_pad2: [c_char; 112], + __ss_pad2: Padding<[c_char; 112]>, } pub struct utsname { @@ -752,7 +752,7 @@ s_no_extra_traits! { pub msg_type: c_long, pub msg_ts: c_ushort, pub msg_spot: c_short, - _pad: [u8; 4], + _pad: Padding<[u8; 4]>, } pub struct msqid_ds { @@ -765,12 +765,12 @@ s_no_extra_traits! { pub msg_lspid: crate::pid_t, pub msg_lrpid: crate::pid_t, pub msg_stime: crate::time_t, - msg_pad1: c_long, + msg_pad1: Padding, pub msg_rtime: crate::time_t, - msg_pad2: c_long, + msg_pad2: Padding, pub msg_ctime: crate::time_t, - msg_pad3: c_long, - msg_pad4: [c_long; 4], + msg_pad3: Padding, + msg_pad4: Padding<[c_long; 4]>, } pub struct sync_t { @@ -781,7 +781,7 @@ s_no_extra_traits! { #[repr(align(4))] pub struct pthread_barrier_t { // union - __pad: [u8; 28], // union + __pad: Padding<[u8; 28]>, // union } pub struct pthread_rwlock_t { @@ -3127,7 +3127,7 @@ impl siginfo_t { pub unsafe fn si_addr(&self) -> *mut c_void { #[repr(C)] struct siginfo_si_addr { - _pad: [u8; 32], + _pad: Padding<[u8; 32]>, si_addr: *mut c_void, } (*(self as *const siginfo_t as *const siginfo_si_addr)).si_addr @@ -3136,7 +3136,7 @@ impl siginfo_t { pub unsafe fn si_value(&self) -> crate::sigval { #[repr(C)] struct siginfo_si_value { - _pad: [u8; 32], + _pad: Padding<[u8; 32]>, si_value: crate::sigval, } (*(self as *const siginfo_t as *const siginfo_si_value)).si_value @@ -3145,7 +3145,7 @@ impl siginfo_t { pub unsafe fn si_pid(&self) -> crate::pid_t { #[repr(C)] struct siginfo_si_pid { - _pad: [u8; 16], + _pad: Padding<[u8; 16]>, si_pid: crate::pid_t, } (*(self as *const siginfo_t as *const siginfo_si_pid)).si_pid @@ -3154,7 +3154,7 @@ impl siginfo_t { pub unsafe fn si_uid(&self) -> crate::uid_t { #[repr(C)] struct siginfo_si_uid { - _pad: [u8; 24], + _pad: Padding<[u8; 24]>, si_uid: crate::uid_t, } (*(self as *const siginfo_t as *const siginfo_si_uid)).si_uid @@ -3163,7 +3163,7 @@ impl siginfo_t { pub unsafe fn si_status(&self) -> c_int { #[repr(C)] struct siginfo_si_status { - _pad: [u8; 28], + _pad: Padding<[u8; 28]>, si_status: c_int, } (*(self as *const siginfo_t as *const siginfo_si_status)).si_status diff --git a/src/unix/nto/neutrino.rs b/src/unix/nto/neutrino.rs index 8aac468009785..5d12d24047188 100644 --- a/src/unix/nto/neutrino.rs +++ b/src/unix/nto/neutrino.rs @@ -239,7 +239,7 @@ s_no_extra_traits! { pub pminfo: syspage_entry_info, pub old_mdriver: syspage_entry_info, spare0: [u32; 1], - __reserved: [u8; 160], // anonymous union with architecture dependent structs + __reserved: Padding<[u8; 160]>, // anonymous union with architecture dependent structs pub new_asinfo: syspage_array_info, pub new_cpuinfo: syspage_array_info, pub new_cacheattr: syspage_array_info, @@ -1245,13 +1245,13 @@ extern "C" { __id: crate::clockid_t, _new: *const crate::_clockperiod, __old: *mut crate::_clockperiod, - __reserved: c_int, + __reserved: Padding, ) -> c_int; pub fn ClockPeriod_r( __id: crate::clockid_t, _new: *const crate::_clockperiod, __old: *mut crate::_clockperiod, - __reserved: c_int, + __reserved: Padding, ) -> c_int; pub fn ClockId(__pid: crate::pid_t, __tid: c_int) -> c_int; pub fn ClockId_r(__pid: crate::pid_t, __tid: c_int) -> c_int; diff --git a/src/unix/nto/x86_64.rs b/src/unix/nto/x86_64.rs index 521b5d4ab7879..1fbfe3bb449bf 100644 --- a/src/unix/nto/x86_64.rs +++ b/src/unix/nto/x86_64.rs @@ -23,11 +23,11 @@ s! { pub r15: u64, pub rip: u64, pub cs: u32, - rsvd1: u32, + rsvd1: Padding, pub rflags: u64, pub rsp: u64, pub ss: u32, - rsvd2: u32, + rsvd2: Padding, } #[repr(align(8))] diff --git a/src/unix/nuttx/mod.rs b/src/unix/nuttx/mod.rs index 79e3f170e0c1f..e3ad7bafd153c 100644 --- a/src/unix/nuttx/mod.rs +++ b/src/unix/nuttx/mod.rs @@ -47,7 +47,7 @@ s! { pub st_ctim: timespec, pub st_blksize: blksize_t, pub st_blocks: i64, - __reserved: [usize; __DEFAULT_RESERVED_SIZE__], + __reserved: Padding<[usize; __DEFAULT_RESERVED_SIZE__]>, } pub struct sockaddr { @@ -63,7 +63,7 @@ s! { pub pw_gecos: *const c_char, pub pw_dir: *const c_char, pub pw_shell: *const c_char, - __reserved: [usize; __DEFAULT_RESERVED_SIZE__], + __reserved: Padding<[usize; __DEFAULT_RESERVED_SIZE__]>, } pub struct sem_t { @@ -118,7 +118,7 @@ s! { pub int_p_cs_precedes: i8, pub int_p_sep_by_space: i8, pub int_p_sign_posn: i8, - __reserved: [usize; __DEFAULT_RESERVED_SIZE__], + __reserved: Padding<[usize; __DEFAULT_RESERVED_SIZE__]>, } pub struct tm { @@ -133,7 +133,7 @@ s! { pub tm_isdst: i32, pub tm_gmtoff: isize, pub tm_zone: *const c_char, - __reserved: [usize; __DEFAULT_RESERVED_SIZE__], + __reserved: Padding<[usize; __DEFAULT_RESERVED_SIZE__]>, } pub struct addrinfo { @@ -145,7 +145,7 @@ s! { pub ai_addr: *mut sockaddr, pub ai_canonname: *mut c_char, pub ai_next: *mut addrinfo, - __reserved: [usize; __DEFAULT_RESERVED_SIZE__], + __reserved: Padding<[usize; __DEFAULT_RESERVED_SIZE__]>, } pub struct pthread_rwlock_t { @@ -164,7 +164,7 @@ s! { pub f_fsid: usize, pub f_flag: usize, pub f_namemax: usize, - __reserved: [usize; __DEFAULT_RESERVED_SIZE__], + __reserved: Padding<[usize; __DEFAULT_RESERVED_SIZE__]>, } pub struct dirent { @@ -185,7 +185,7 @@ s! { pub sa_mask: sigset_t, pub sa_flags: i32, pub sa_user: usize, - __reserved: [usize; __DEFAULT_RESERVED_SIZE__], + __reserved: Padding<[usize; __DEFAULT_RESERVED_SIZE__]>, } pub struct termios { @@ -195,7 +195,7 @@ s! { pub c_lflag: tcflag_t, pub c_cc: [cc_t; 12], pub c_speed: speed_t, - __reserved: [usize; __DEFAULT_RESERVED_SIZE__], + __reserved: Padding<[usize; __DEFAULT_RESERVED_SIZE__]>, } pub struct in_addr { diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs index ad2a6d75a34f8..8c6784fd077bf 100644 --- a/src/unix/redox/mod.rs +++ b/src/unix/redox/mod.rs @@ -163,7 +163,7 @@ s! { pub si_signo: c_int, pub si_errno: c_int, pub si_code: c_int, - _pad: [c_int; 29], + _pad: Padding<[c_int; 29]>, _align: [usize; 0], } @@ -204,7 +204,7 @@ s! { pub st_mtime_nsec: c_long, pub st_ctime: crate::time_t, pub st_ctime_nsec: c_long, - _pad: [c_char; 24], + _pad: Padding<[c_char; 24]>, } pub struct statvfs { diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index b213fc64ed802..248c90a9ea17e 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -226,24 +226,24 @@ s! { pub gl_pathc: size_t, pub gl_pathv: *mut *mut c_char, pub gl_offs: size_t, - __unused1: *mut c_void, - __unused2: c_int, + __unused1: Padding<*mut c_void>, + __unused2: Padding, #[cfg(target_os = "illumos")] - __unused3: c_int, + __unused3: Padding, #[cfg(target_os = "illumos")] - __unused4: c_int, + __unused4: Padding, #[cfg(target_os = "illumos")] - __unused5: *mut c_void, + __unused5: Padding<*mut c_void>, #[cfg(target_os = "illumos")] - __unused6: *mut c_void, + __unused6: Padding<*mut c_void>, #[cfg(target_os = "illumos")] - __unused7: *mut c_void, + __unused7: Padding<*mut c_void>, #[cfg(target_os = "illumos")] - __unused8: *mut c_void, + __unused8: Padding<*mut c_void>, #[cfg(target_os = "illumos")] - __unused9: *mut c_void, + __unused9: Padding<*mut c_void>, #[cfg(target_os = "illumos")] - __unused10: *mut c_void, + __unused10: Padding<*mut c_void>, } pub struct addrinfo { @@ -300,7 +300,7 @@ s! { pub struct sched_param { pub sched_priority: c_int, - sched_pad: [c_int; 8], + sched_pad: Padding<[c_int; 8]>, } pub struct Dl_info { @@ -393,7 +393,7 @@ s! { pub mq_maxmsg: c_long, pub mq_msgsize: c_long, pub mq_curmsgs: c_long, - _pad: [c_int; 12], + _pad: Padding<[c_int; 12]>, } pub struct port_event { @@ -507,9 +507,9 @@ s! { pub struct sockaddr_storage { pub ss_family: crate::sa_family_t, - __ss_pad1: [u8; 6], + __ss_pad1: Padding<[u8; 6]>, __ss_align: i64, - __ss_pad2: [u8; 240], + __ss_pad2: Padding<[u8; 240]>, } pub struct sockaddr_dl { @@ -528,7 +528,7 @@ s! { pub sigev_value: crate::sigval, pub ss_sp: *mut c_void, pub sigev_notify_attributes: *const crate::pthread_attr_t, - __sigev_pad2: c_int, + __sigev_pad2: Padding, } } @@ -685,7 +685,7 @@ s_no_extra_traits! { uid: crate::uid_t, value: crate::sigval, // Pad out to match the SIGCLD value size - _pad: *mut c_void, + _pad: Padding<*mut c_void>, } struct siginfo_sigcld { diff --git a/src/wasi/mod.rs b/src/wasi/mod.rs index 58e7a928bea3c..7891322991ed8 100644 --- a/src/wasi/mod.rs +++ b/src/wasi/mod.rs @@ -159,7 +159,7 @@ s! { pub st_mode: mode_t, pub st_uid: uid_t, pub st_gid: gid_t, - __pad0: c_uint, + __pad0: Padding, pub st_rdev: dev_t, pub st_size: off_t, pub st_blksize: blksize_t, @@ -167,7 +167,7 @@ s! { pub st_atim: timespec, pub st_mtim: timespec, pub st_ctim: timespec, - __reserved: [c_longlong; 3], + __reserved: Padding<[c_longlong; 3]>, } pub struct fd_set {