From 64849c7d59fb9a11562040b5ac66a7d655789ae4 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 11 May 2023 11:44:24 -0600
Subject: [PATCH] Fix types for 32-bit systems
---
src/header/signal/mod.rs | 6 +++---
src/header/time/mod.rs | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/header/signal/mod.rs b/src/header/signal/mod.rs
index 9ba4f70c9..1e125cefd 100644
--- a/src/header/signal/mod.rs
+++ b/src/header/signal/mod.rs
@@ -259,9 +259,9 @@ pub extern "C" fn sigpending(set: *mut sigset_t) -> c_int {
Sys::sigpending(set)
}
-const BELOW_SIGRTMIN_MASK: u64 = (1 << SIGRTMIN) - 1;
-const STANDARD_SIG_MASK: u64 = (1 << 32) - 1;
-const RLCT_SIGNAL_MASK: u64 = BELOW_SIGRTMIN_MASK & !STANDARD_SIG_MASK;
+const BELOW_SIGRTMIN_MASK: c_ulong = (1 << SIGRTMIN) - 1;
+const STANDARD_SIG_MASK: c_ulong = (1 << 32) - 1;
+const RLCT_SIGNAL_MASK: c_ulong = BELOW_SIGRTMIN_MASK & !STANDARD_SIG_MASK;
#[no_mangle]
pub unsafe extern "C" fn sigprocmask(how: c_int, set: *const sigset_t, oset: *mut sigset_t) -> c_int {
diff --git a/src/header/time/mod.rs b/src/header/time/mod.rs
index bdb876a7d..8074dc914 100644
--- a/src/header/time/mod.rs
+++ b/src/header/time/mod.rs
@@ -29,12 +29,12 @@ impl timespec {
Some(if later_nsec > earlier_nsec {
timespec {
tv_sec: later.tv_sec.checked_sub(earlier.tv_sec)?,
- tv_nsec: (later_nsec - earlier_nsec) as i64,
+ tv_nsec: (later_nsec - earlier_nsec) as c_long,
}
} else {
timespec {
tv_sec: later.tv_sec.checked_sub(earlier.tv_sec)?.checked_sub(1)?,
- tv_nsec: 1_000_000_000 - (earlier_nsec - later_nsec) as i64,
+ tv_nsec: 1_000_000_000 - (earlier_nsec - later_nsec) as c_long,
}
})
}
--
GitLab