gnu: Make type statfs64 an alias of struct statfs

Author: snogge

libc-test/build.rs

@@ -3339,6 +3339,8 @@ fn test_linux(target: &str) {
 
             // In MUSL `flock64` is a typedef to `flock`.
             "flock64" if musl => format!("struct {}", ty),
+			// In some gnu targets `stat64` is a typedef to `stat`
+			"statfs64" if gnu => format!("struct {}", ty),
 
             // put `struct` in front of all structs:.
             t if is_struct => format!("struct {}", t),

src/unix/linux_like/linux/gnu/b32/arm/mod.rs

@@ -1,6 +1,8 @@
 pub type c_char = u8;
 pub type wchar_t = u32;
 
+pub type statfs64 = statfs;
+
 s! {
     pub struct sigaction {
         pub sa_sigaction: ::sighandler_t,
@@ -74,21 +76,6 @@ s! {
         pub st_ctime_nsec: ::c_long,
     }
 
-    pub struct statfs64 {
-        pub f_type: ::__fsword_t,
-        pub f_bsize: ::__fsword_t,
-        pub f_blocks: u64,
-        pub f_bfree: u64,
-        pub f_bavail: u64,
-        pub f_files: u64,
-        pub f_ffree: u64,
-        pub f_fsid: ::fsid_t,
-        pub f_namelen: ::__fsword_t,
-        pub f_frsize: ::__fsword_t,
-        pub f_flags: ::__fsword_t,
-        pub f_spare: [::__fsword_t; 4],
-    }
-
     pub struct statvfs64 {
         pub f_bsize: ::c_ulong,
         pub f_frsize: ::c_ulong,

src/unix/linux_like/linux/gnu/b32/mips/mod.rs

@@ -1,6 +1,7 @@
 pub type c_char = i8;
 pub type wchar_t = i32;
 
+pub type statfs64 = statfs;
 s! {
     pub struct stat64 {
         pub st_dev: ::dev_t,
@@ -39,21 +40,6 @@ s! {
         f_spare: [::c_long; 6],
     }
 
-    pub struct statfs64 {
-        pub f_type: ::c_long,
-        pub f_bsize: ::c_long,
-        pub f_frsize: ::c_long,
-        pub f_blocks: u64,
-        pub f_bfree: u64,
-        pub f_files: u64,
-        pub f_ffree: u64,
-        pub f_bavail: u64,
-        pub f_fsid: ::fsid_t,
-        pub f_namelen: ::c_long,
-        pub f_flags: ::c_long,
-        pub f_spare: [::c_long; 5],
-    }
-
     pub struct statvfs64 {
         pub f_bsize: ::c_ulong,
         pub f_frsize: ::c_ulong,

src/unix/linux_like/linux/gnu/b32/x86/mod.rs

@@ -2,6 +2,8 @@ pub type c_char = i8;
 pub type wchar_t = i32;
 pub type greg_t = i32;
 
+pub type statfs64 = statfs;
+
 s! {
     pub struct sigaction {
         pub sa_sigaction: ::sighandler_t,
@@ -151,21 +153,6 @@ s! {
         __pad3: i32,
     }
 
-    pub struct statfs64 {
-        pub f_type: ::__fsword_t,
-        pub f_bsize: ::__fsword_t,
-        pub f_blocks: u64,
-        pub f_bfree: u64,
-        pub f_bavail: u64,
-        pub f_files: u64,
-        pub f_ffree: u64,
-        pub f_fsid: ::fsid_t,
-        pub f_namelen: ::__fsword_t,
-        pub f_frsize: ::__fsword_t,
-        pub f_flags: ::__fsword_t,
-        pub f_spare: [::__fsword_t; 4],
-    }
-
     pub struct statvfs64 {
         pub f_bsize: ::c_ulong,
         pub f_frsize: ::c_ulong,

src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs

@@ -9,6 +9,8 @@ pub type suseconds_t = i64;
 pub type __u64 = ::c_ulonglong;
 pub type __s64 = ::c_longlong;
 
+pub type statfs64 = statfs;
+
 s! {
     pub struct sigaction {
         pub sa_sigaction: ::sighandler_t,
@@ -114,21 +116,6 @@ s! {
         __reserved: [i64; 3],
     }
 
-    pub struct statfs64 {
-        pub f_type: ::__fsword_t,
-        pub f_bsize: ::__fsword_t,
-        pub f_blocks: u64,
-        pub f_bfree: u64,
-        pub f_bavail: u64,
-        pub f_files: u64,
-        pub f_ffree: u64,
-        pub f_fsid: ::fsid_t,
-        pub f_namelen: ::__fsword_t,
-        pub f_frsize: ::__fsword_t,
-        pub f_flags: ::__fsword_t,
-        pub f_spare: [::__fsword_t; 4],
-    }
-
     pub struct statvfs64 {
         pub f_bsize: ::c_ulong,
         pub f_frsize: ::c_ulong,