diff options
| author | Colin Cross <ccross@android.com> | 2022-10-25 01:25:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-25 01:25:23 +0000 |
| commit | 3dad40813245db793f5fb9b07ee44d3ae310f863 (patch) | |
| tree | aa4fc2dd044ffe92968044a158170f7ed9bdabf0 | |
| parent | e01363e7093a9d790717b60b61af7b34c5d54d1b (diff) | |
| parent | adc8c7b1e5ed03bfa8cc6548111e909040d0da11 (diff) | |
| download | libc-3dad40813245db793f5fb9b07ee44d3ae310f863.tar.gz | |
HACK: use i64 for time_t on musl am: d8ad45fd80 am: 96f34504b9 am: adc8c7b1e5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libc/+/2256265
Change-Id: I267634cd2cd8df10f42ea4485c65aa6822c405ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/musl_time_t.patch | 13 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/musl/mod.rs | 2 |
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; |