Fix compilation error on 32-bit Apple (#1407)

Author: madsmtm

.github/workflows/main.yml

@@ -233,6 +233,7 @@ jobs:
     - run: cargo check -Z build-std --target=mips64el-unknown-linux-gnuabi64 --features=all-apis
     - run: cargo check -Z build-std --target=powerpc-unknown-linux-musl --features=all-apis
     - run: cargo check -Z build-std --target=powerpc64le-unknown-linux-musl --features=all-apis
+    - run: cargo check -Z build-std --target=armv7k-apple-watchos --features=all-apis
 
 
   test:

src/backend/libc/fs/syscalls.rs

@@ -2654,12 +2654,12 @@ pub(crate) fn fremovexattr(fd: BorrowedFd<'_>, name: &CStr) -> io::Result<()> {
 /// See [`crate::timespec::fix_negative_nsec`] for details.
 #[cfg(apple)]
 fn fix_negative_stat_nsecs(mut stat: Stat) -> Stat {
-    stat.st_atime_nsec =
-        crate::timespec::fix_negative_nsecs(&mut stat.st_atime, stat.st_atime_nsec as _) as _;
-    stat.st_mtime_nsec =
-        crate::timespec::fix_negative_nsecs(&mut stat.st_mtime, stat.st_mtime_nsec as _) as _;
-    stat.st_ctime_nsec =
-        crate::timespec::fix_negative_nsecs(&mut stat.st_ctime, stat.st_ctime_nsec as _) as _;
+    (stat.st_atime, stat.st_atime_nsec) =
+        crate::timespec::fix_negative_nsecs(stat.st_atime, stat.st_atime_nsec);
+    (stat.st_mtime, stat.st_mtime_nsec) =
+        crate::timespec::fix_negative_nsecs(stat.st_mtime, stat.st_mtime_nsec);
+    (stat.st_ctime, stat.st_ctime_nsec) =
+        crate::timespec::fix_negative_nsecs(stat.st_ctime, stat.st_ctime_nsec);
     stat
 }
 

src/backend/libc/time/syscalls.rs

@@ -475,7 +475,10 @@ fn timerfd_gettime_old(fd: BorrowedFd<'_>) -> io::Result<Itimerspec> {
 
 /// See [`crate::timespec::fix_negative_nsecs`] for details.
 #[cfg(apple)]
+#[cfg(not(fix_y2038))]
 fn fix_negative_timespec_nsecs(mut ts: Timespec) -> Timespec {
-    ts.tv_nsec = crate::timespec::fix_negative_nsecs(&mut ts.tv_sec, ts.tv_nsec as _) as _;
+    let (sec, nsec) = crate::timespec::fix_negative_nsecs(ts.tv_sec as _, ts.tv_nsec as _);
+    ts.tv_sec = sec as _;
+    ts.tv_nsec = nsec as _;
     ts
 }

src/timespec.rs

@@ -338,31 +338,34 @@ pub(crate) fn option_as_libc_timespec_ptr(timespec: Option<&Timespec>) -> *const
 /// [here]: https://github.com/rust-lang/rust/issues/108277#issuecomment-1787057158
 #[cfg(apple)]
 #[inline]
-pub(crate) fn fix_negative_nsecs(secs: &mut i64, mut nsecs: i32) -> i32 {
+pub(crate) fn fix_negative_nsecs(
+    mut secs: c::time_t,
+    mut nsecs: c::c_long,
+) -> (c::time_t, c::c_long) {
     #[cold]
-    fn adjust(secs: &mut i64, nsecs: i32) -> i32 {
+    fn adjust(secs: &mut c::time_t, nsecs: c::c_long) -> c::c_long {
         assert!(nsecs >= -1_000_000_000);
         assert!(*secs < 0);
-        assert!(*secs > i64::MIN);
+        assert!(*secs > c::time_t::MIN);
         *secs -= 1;
         nsecs + 1_000_000_000
     }
 
     if nsecs < 0 {
-        nsecs = adjust(secs, nsecs);
+        nsecs = adjust(&mut secs, nsecs);
     }
-    nsecs
+    (secs, nsecs)
 }
 
 #[cfg(apple)]
 #[test]
 fn test_negative_timestamps() {
     let mut secs = -59;
     let mut nsecs = -900_000_000;
-    nsecs = fix_negative_nsecs(&mut secs, nsecs);
+    (secs, nsecs) = fix_negative_nsecs(secs, nsecs);
     assert_eq!(secs, -60);
     assert_eq!(nsecs, 100_000_000);
-    nsecs = fix_negative_nsecs(&mut secs, nsecs);
+    (secs, nsecs) = fix_negative_nsecs(secs, nsecs);
     assert_eq!(secs, -60);
     assert_eq!(nsecs, 100_000_000);
 }