Skip to content

Commit 2499ff0

Browse files
committed
riscv32-musl: Rename padding fields to avoid a conflict
Build fails on `riscv32gc-unknown-linux-musl` because the fields `__pad1` and `__pad2` are duplicated. This likely came up during the apply then revert of the `timespec` change. Rename `__pad1` to `__st_rdev_padding` to match other musl `struct stat` instances. None of the others seem to have padding for `st_blksize` so this name is new but follows the same pattern.
1 parent 61c5c59 commit 2499ff0

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • src/unix/linux_like/linux/musl/b32/riscv32

src/unix/linux_like/linux/musl/b32/riscv32/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ s! {
1616
pub st_uid: crate::uid_t,
1717
pub st_gid: crate::gid_t,
1818
pub st_rdev: crate::dev_t,
19-
pub __pad1: crate::dev_t,
19+
__st_rdev_padding: Padding<crate::dev_t>,
2020
pub st_size: off_t,
2121
pub st_blksize: crate::blksize_t,
22-
pub __pad2: c_int,
22+
__st_blksize_padding: Padding<c_int>,
2323
pub st_blocks: crate::blkcnt_t,
2424
pub st_atime: crate::time_t,
2525
#[cfg(all(musl32_time64, target_endian = "big"))]

0 commit comments

Comments
 (0)