Skip to content

Commit e0ef910

Browse files
committed
Auto merge of #3137 - nekopsykose:s390x-statfs, r=Amanieu
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
2 parents 586541b + cb8a548 commit e0ef910

File tree

1 file changed

+12
-12
lines changed
  • src/unix/linux_like/linux/musl/b64

1 file changed

+12
-12
lines changed

src/unix/linux_like/linux/musl/b64/s390x.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -60,33 +60,33 @@ s! {
6060
}
6161

6262
pub struct statfs {
63-
pub f_type: ::c_ulong,
64-
pub f_bsize: ::c_ulong,
63+
pub f_type: ::c_uint,
64+
pub f_bsize: ::c_uint,
6565
pub f_blocks: ::fsblkcnt_t,
6666
pub f_bfree: ::fsblkcnt_t,
6767
pub f_bavail: ::fsblkcnt_t,
6868
pub f_files: ::fsfilcnt_t,
6969
pub f_ffree: ::fsfilcnt_t,
7070
pub f_fsid: ::fsid_t,
71-
pub f_namelen: ::c_ulong,
72-
pub f_frsize: ::c_ulong,
73-
pub f_flags: ::c_ulong,
74-
pub f_spare: [::c_ulong; 4],
71+
pub f_namelen: ::c_uint,
72+
pub f_frsize: ::c_uint,
73+
pub f_flags: ::c_uint,
74+
pub f_spare: [::c_uint; 4],
7575
}
7676

7777
pub struct statfs64 {
78-
pub f_type: ::c_ulong,
79-
pub f_bsize: ::c_ulong,
78+
pub f_type: ::c_uint,
79+
pub f_bsize: ::c_uint,
8080
pub f_blocks: ::fsblkcnt_t,
8181
pub f_bfree: ::fsblkcnt_t,
8282
pub f_bavail: ::fsblkcnt_t,
8383
pub f_files: ::fsfilcnt_t,
8484
pub f_ffree: ::fsfilcnt_t,
8585
pub f_fsid: ::fsid_t,
86-
pub f_namelen: ::c_ulong,
87-
pub f_frsize: ::c_ulong,
88-
pub f_flags: ::c_ulong,
89-
pub f_spare: [::c_ulong; 4],
86+
pub f_namelen: ::c_uint,
87+
pub f_frsize: ::c_uint,
88+
pub f_flags: ::c_uint,
89+
pub f_spare: [::c_uint; 4],
9090
}
9191
}
9292

0 commit comments

Comments
 (0)