[WIP] fix on android/aarch64 and guard the structs

the statx struct is in a separate file because the style check doesn't
allow multiple s! macros in one file, and #[cfg()] doesn't work in s!.

Plain u64 (or uint64_t in C) can't be used for the statx fields because
bionic defines them as __u64, and provides incompatible definitions of
uint64_t and __u64.

Author: neuschaefer

src/unix/linux_like/android/b64/aarch64/mod.rs

@@ -1,7 +1,7 @@
 pub type c_char = u8;
 pub type wchar_t = u32;
-pub type __u64 = ::c_ulonglong;
-pub type __s64 = ::c_longlong;
+pub type __u64 = ::c_ulong;
+pub type __s64 = ::c_long;
 
 s! {
     pub struct stat {

src/unix/linux_like/linux_statx.rs

@@ -0,0 +1,44 @@
+s! {
+    pub struct statx {
+        pub stx_mask: ::__u32,
+        pub stx_blksize: ::__u32,
+        pub stx_attributes: ::__u64,
+        pub stx_nlink: ::__u32,
+        pub stx_uid: ::__u32,
+        pub stx_gid: ::__u32,
+        pub stx_mode: ::__u16,
+        __statx_pad1: [::__u16; 1],
+        pub stx_ino: ::__u64,
+        pub stx_size: ::__u64,
+        pub stx_blocks: ::__u64,
+        pub stx_attributes_mask: ::__u64,
+        pub stx_atime: statx_timestamp,
+        pub stx_btime: statx_timestamp,
+        pub stx_ctime: statx_timestamp,
+        pub stx_mtime: statx_timestamp,
+        pub stx_rdev_major: ::__u32,
+        pub stx_rdev_minor: ::__u32,
+        pub stx_dev_major: ::__u32,
+        pub stx_dev_minor: ::__u32,
+        pub stx_mnt_id: ::__u64,
+        pub stx_dio_mem_align: ::__u32,
+        pub stx_dio_offset_align: ::__u32,
+        __statx_pad3: [::__u64; 12],
+    }
+
+    pub struct statx_timestamp {
+        pub tv_sec: ::__s64,
+        pub tv_nsec: ::__u32,
+        __statx_timestamp_pad1: [::__s32; 1],
+    }
+}
+
+extern "C" {
+    pub fn statx(
+        dirfd: ::c_int,
+        pathname: *const ::c_char,
+        flags: ::c_int,
+        mask: ::c_uint,
+        statxbuf: *mut statx,
+    ) -> ::c_int;
+}

src/unix/linux_like/mod.rs

@@ -204,39 +204,6 @@ s! {
         pub msg_hdr: ::msghdr,
         pub msg_len: ::c_uint,
     }
-
-    pub struct statx {
-        pub stx_mask: u32,
-        pub stx_blksize: u32,
-        pub stx_attributes: u64,
-        pub stx_nlink: u32,
-        pub stx_uid: u32,
-        pub stx_gid: u32,
-        pub stx_mode: u16,
-        __statx_pad1: [u16; 1],
-        pub stx_ino: u64,
-        pub stx_size: u64,
-        pub stx_blocks: u64,
-        pub stx_attributes_mask: u64,
-        pub stx_atime: statx_timestamp,
-        pub stx_btime: statx_timestamp,
-        pub stx_ctime: statx_timestamp,
-        pub stx_mtime: statx_timestamp,
-        pub stx_rdev_major: u32,
-        pub stx_rdev_minor: u32,
-        pub stx_dev_major: u32,
-        pub stx_dev_minor: u32,
-        pub stx_mnt_id: u64,
-        pub stx_dio_mem_align: u32,
-        pub stx_dio_offset_align: u32,
-        __statx_pad3: [u64; 12],
-    }
-
-    pub struct statx_timestamp {
-        pub tv_sec: i64,
-        pub tv_nsec: u32,
-        __statx_timestamp_pad1: [i32; 1],
-    }
 }
 
 s_no_extra_traits! {
@@ -1922,15 +1889,8 @@ cfg_if! {
 // The statx syscall, available on some libcs.
 cfg_if! {
     if #[cfg(any(target_env = "gnu", target_os = "android"))] {
-        extern "C" {
-            pub fn statx(
-                dirfd: ::c_int,
-                pathname: *const c_char,
-                flags: ::c_int,
-                mask: ::c_uint,
-                statxbuf: *mut statx,
-            ) -> ::c_int;
-        }
+        mod linux_statx;
+        pub use self::linux_statx::*;
     }
 }