From 94088a81f6e5b93c608fe58a7c939a8a029b9552 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Wed, 28 Jun 2023 19:52:06 +0100
Subject: [PATCH] android 32 bits fix stat struct proposal.

close #3285
---
 src/unix/linux_like/android/b32/mod.rs | 45 +++++++++++++-------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/unix/linux_like/android/b32/mod.rs b/src/unix/linux_like/android/b32/mod.rs
index aa29267f9db50..3a34ea95f9401 100644
--- a/src/unix/linux_like/android/b32/mod.rs
+++ b/src/unix/linux_like/android/b32/mod.rs
@@ -25,47 +25,46 @@ s! {
     }
 
     pub struct stat {
-        pub st_dev: ::c_ulonglong,
-        __pad0: [::c_uchar; 4],
-        __st_ino: ::ino_t,
-        pub st_mode: ::c_uint,
+        pub st_dev: ::dev_t,
+        pub st_ino: ::ino_t,
+        pub st_mode: ::c_ushort,
         pub st_nlink: ::nlink_t,
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
-        pub st_rdev: ::c_ulonglong,
-        __pad3: [::c_uchar; 4],
-        pub st_size: ::c_longlong,
+        pub st_rdev: ::dev_t,
+        pub st_size: ::off_t,
         pub st_blksize: ::blksize_t,
-        pub st_blocks: ::c_ulonglong,
-        pub st_atime: ::c_long,
-        pub st_atime_nsec: ::c_long,
-        pub st_mtime: ::c_long,
-        pub st_mtime_nsec: ::c_long,
-        pub st_ctime: ::c_long,
-        pub st_ctime_nsec: ::c_long,
-        pub st_ino: ::c_ulonglong,
+        pub st_blocks: ::blkcnt_t,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_ulong,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_ulong,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_ulong,
+        __unused4: c_ulong,
+        __unused5: c_ulong,
     }
 
     pub struct stat64 {
-        pub st_dev: ::c_ulonglong,
+        pub st_dev: ::dev_t,
         __pad0: [::c_uchar; 4],
         __st_ino: ::ino_t,
         pub st_mode: ::c_uint,
         pub st_nlink: ::nlink_t,
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
-        pub st_rdev: ::c_ulonglong,
+        pub st_rdev: ::dev_t,
         __pad3: [::c_uchar; 4],
-        pub st_size: ::c_longlong,
+        pub st_size: ::off_t,
         pub st_blksize: ::blksize_t,
-        pub st_blocks: ::c_ulonglong,
-        pub st_atime: ::c_long,
+        pub st_blocks: ::blkcnt_t,
+        pub st_atime: ::time_t,
         pub st_atime_nsec: ::c_long,
-        pub st_mtime: ::c_long,
+        pub st_mtime: ::time_t,
         pub st_mtime_nsec: ::c_long,
-        pub st_ctime: ::c_long,
+        pub st_ctime: ::time_t,
         pub st_ctime_nsec: ::c_long,
-        pub st_ino: ::c_ulonglong,
+        pub st_ino: ::dev_t,
     }
 
     pub struct statfs64 {