aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2022-10-25 00:48:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-25 00:48:26 +0000
commitadc8c7b1e5ed03bfa8cc6548111e909040d0da11 (patch)
treeaa4fc2dd044ffe92968044a158170f7ed9bdabf0
parentbe0b617ced2a0452588c8afd5bc191d44d5f83a2 (diff)
parent96f34504b9070dec08b2b621a5bb37c3f321723f (diff)
downloadlibc-adc8c7b1e5ed03bfa8cc6548111e909040d0da11.tar.gz
HACK: use i64 for time_t on musl am: d8ad45fd80 am: 96f34504b9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libc/+/2256265 Change-Id: I73aa969532a99a0a1931ab63c5044697e1370159 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--patches/musl_time_t.patch13
-rw-r--r--src/unix/linux_like/linux/musl/mod.rs2
2 files changed, 14 insertions, 1 deletions
diff --git a/patches/musl_time_t.patch b/patches/musl_time_t.patch
new file mode 100644
index 00000000..c238a17d
--- /dev/null
+++ b/patches/musl_time_t.patch
@@ -0,0 +1,13 @@
+diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
+index 70710734..929108ce 100644
+--- a/src/unix/linux_like/linux/musl/mod.rs
++++ b/src/unix/linux_like/linux/musl/mod.rs
+@@ -9,7 +9,7 @@ pub type clock_t = c_long;
+ See #1848 for more info."
+ )
+ )]
+-pub type time_t = c_long;
++pub type time_t = i64;
+ pub type suseconds_t = c_long;
+ pub type ino_t = u64;
+ pub type off_t = i64;
diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
index 70710734..929108ce 100644
--- a/src/unix/linux_like/linux/musl/mod.rs
+++ b/src/unix/linux_like/linux/musl/mod.rs
@@ -9,7 +9,7 @@ pub type clock_t = c_long;
See #1848 for more info."
)
)]
-pub type time_t = c_long;
+pub type time_t = i64;
pub type suseconds_t = c_long;
pub type ino_t = u64;
pub type off_t = i64;