diff options
| author | bors <bors@rust-lang.org> | 2023-05-18 01:21:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-18 01:21:37 +0000 |
| commit | e0ef91094dede9643ddab15abaed699f8aec06df (patch) | |
| tree | b9410f350e050066640d2254f3cd43ba424f2dd2 | |
| parent | 586541b97e047cfec540fad752bc1eaca4acac36 (diff) | |
| parent | cb8a548f63810adadd9a8b69aa8a05a898659d49 (diff) | |
| download | rust-libc-main.tar.gz | |
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 https://github.com/nix-rust/nix/pull/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
| -rw-r--r-- | src/unix/linux_like/linux/musl/b64/s390x.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/unix/linux_like/linux/musl/b64/s390x.rs b/src/unix/linux_like/linux/musl/b64/s390x.rs index c7d6b1bd2c..a883b764b9 100644 --- a/src/unix/linux_like/linux/musl/b64/s390x.rs +++ b/src/unix/linux_like/linux/musl/b64/s390x.rs @@ -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], } } |