Skip to content

Commit

Permalink
Auto merge of #3137 - nekopsykose:s390x-statfs, r=Amanieu
Browse files Browse the repository at this point in the history
linux/musl/s390x: change f_* constants to uint from ulong

musl defines these as `unsigned`, not `unsigned long`
https://github.com/bminor/musl/blob/7d756e1c04de6eb3f2b3d3e1141a218bb329fcfb/arch/s390x/bits/statfs.h#L2

mostly relevant to also fixing nix-rust/nix#1835

that said, i don't know if this is a huge breaking change or not, only that the current one isn't correct afaict
  • Loading branch information
bors committed May 18, 2023
2 parents 586541b + cb8a548 commit e0ef910
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/unix/linux_like/linux/musl/b64/s390x.rs
Expand Up @@ -60,33 +60,33 @@ s! {
}

pub struct statfs {
pub f_type: ::c_ulong,
pub f_bsize: ::c_ulong,
pub f_type: ::c_uint,
pub f_bsize: ::c_uint,
pub f_blocks: ::fsblkcnt_t,
pub f_bfree: ::fsblkcnt_t,
pub f_bavail: ::fsblkcnt_t,
pub f_files: ::fsfilcnt_t,
pub f_ffree: ::fsfilcnt_t,
pub f_fsid: ::fsid_t,
pub f_namelen: ::c_ulong,
pub f_frsize: ::c_ulong,
pub f_flags: ::c_ulong,
pub f_spare: [::c_ulong; 4],
pub f_namelen: ::c_uint,
pub f_frsize: ::c_uint,
pub f_flags: ::c_uint,
pub f_spare: [::c_uint; 4],
}

pub struct statfs64 {
pub f_type: ::c_ulong,
pub f_bsize: ::c_ulong,
pub f_type: ::c_uint,
pub f_bsize: ::c_uint,
pub f_blocks: ::fsblkcnt_t,
pub f_bfree: ::fsblkcnt_t,
pub f_bavail: ::fsblkcnt_t,
pub f_files: ::fsfilcnt_t,
pub f_ffree: ::fsfilcnt_t,
pub f_fsid: ::fsid_t,
pub f_namelen: ::c_ulong,
pub f_frsize: ::c_ulong,
pub f_flags: ::c_ulong,
pub f_spare: [::c_ulong; 4],
pub f_namelen: ::c_uint,
pub f_frsize: ::c_uint,
pub f_flags: ::c_uint,
pub f_spare: [::c_uint; 4],
}
}

Expand Down

0 comments on commit e0ef910

Please sign in to comment.