diff --git a/libc-test/build.rs b/libc-test/build.rs index 5d915e13412fda412a53c8e412b1bf4c014717e6..4fd21721b97a43b4b177c3372ed91aca45e1e6b7 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -1351,6 +1351,7 @@ fn test_android(target: &str) { s if s.ends_with("_nsec") && struct_.starts_with("stat") => { s.to_string() } + "u64" if struct_ == "epoll_event" => "data.u64".to_string(), s => s.to_string(), } }); diff --git a/src/unix/notbsd/android/b32/mod.rs b/src/unix/notbsd/android/b32/mod.rs index f2ff9492ddd9eee3c05b8d65340d800d04d77af6..e0a0d7e67cf420f50c0985f8175620f5b54090a3 100644 --- a/src/unix/notbsd/android/b32/mod.rs +++ b/src/unix/notbsd/android/b32/mod.rs @@ -35,12 +35,12 @@ s! { pub st_size: ::c_longlong, pub st_blksize: ::blksize_t, pub st_blocks: ::c_ulonglong, - pub st_atime: ::c_ulong, - pub st_atime_nsec: ::c_ulong, - pub st_mtime: ::c_ulong, - pub st_mtime_nsec: ::c_ulong, - pub st_ctime: ::c_ulong, - pub st_ctime_nsec: ::c_ulong, + 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, } @@ -57,12 +57,12 @@ s! { pub st_size: ::c_longlong, pub st_blksize: ::blksize_t, pub st_blocks: ::c_ulonglong, - pub st_atime: ::c_ulong, - pub st_atime_nsec: ::c_ulong, - pub st_mtime: ::c_ulong, - pub st_mtime_nsec: ::c_ulong, - pub st_ctime: ::c_ulong, - pub st_ctime_nsec: ::c_ulong, + 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, } diff --git a/src/unix/notbsd/android/b64/aarch64.rs b/src/unix/notbsd/android/b64/aarch64.rs index 94b7959b3bd457289afaef50ca534c0ac67fd63b..cb1c81b26057921b99b6f3aeb221f5152a70fc17 100644 --- a/src/unix/notbsd/android/b64/aarch64.rs +++ b/src/unix/notbsd/android/b64/aarch64.rs @@ -16,11 +16,11 @@ s! { __pad2: ::c_int, pub st_blocks: ::c_long, pub st_atime: ::time_t, - pub st_atime_nsec: ::c_ulong, + pub st_atime_nsec: ::c_long, pub st_mtime: ::time_t, - pub st_mtime_nsec: ::c_ulong, + pub st_mtime_nsec: ::c_long, pub st_ctime: ::time_t, - pub st_ctime_nsec: ::c_ulong, + pub st_ctime_nsec: ::c_long, __unused4: ::c_uint, __unused5: ::c_uint, } @@ -39,11 +39,11 @@ s! { __pad2: ::c_int, pub st_blocks: ::c_long, pub st_atime: ::time_t, - pub st_atime_nsec: ::c_ulong, + pub st_atime_nsec: ::c_long, pub st_mtime: ::time_t, - pub st_mtime_nsec: ::c_ulong, + pub st_mtime_nsec: ::c_long, pub st_ctime: ::time_t, - pub st_ctime_nsec: ::c_ulong, + pub st_ctime_nsec: ::c_long, __unused4: ::c_uint, __unused5: ::c_uint, } diff --git a/src/unix/notbsd/android/b64/x86_64.rs b/src/unix/notbsd/android/b64/x86_64.rs index c813e7da32077836af5b320f10e2381ae8340ec9..2ab6080a6d63fb899c118fceca5e9ffc00702ae8 100644 --- a/src/unix/notbsd/android/b64/x86_64.rs +++ b/src/unix/notbsd/android/b64/x86_64.rs @@ -13,12 +13,12 @@ s! { pub st_size: ::off64_t, pub st_blksize: ::c_long, pub st_blocks: ::c_long, - pub st_atime: ::c_ulong, - pub st_atime_nsec: ::c_ulong, - pub st_mtime: ::c_ulong, - pub st_mtime_nsec: ::c_ulong, - pub st_ctime: ::c_ulong, - pub st_ctime_nsec: ::c_ulong, + 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, __unused: [::c_long; 3], } @@ -33,12 +33,12 @@ s! { pub st_size: ::off64_t, pub st_blksize: ::c_long, pub st_blocks: ::c_long, - pub st_atime: ::c_ulong, - pub st_atime_nsec: ::c_ulong, - pub st_mtime: ::c_ulong, - pub st_mtime_nsec: ::c_ulong, - pub st_ctime: ::c_ulong, - pub st_ctime_nsec: ::c_ulong, + 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, __unused: [::c_long; 3], } }