From 4159fb5fc02fe5cd543ffdc8049e15e11a6b8982 Mon Sep 17 00:00:00 2001 From: Jan Noha Date: Thu, 3 Apr 2025 21:27:18 +0200 Subject: [PATCH] Fix makedev function signature on Apple targets --- src/unix/bsd/apple/mod.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index 11b61376275d7..2095c450ca27f 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -5587,16 +5587,16 @@ safe_f! { _WSTATUS(status) == _WSTOPPED && WSTOPSIG(status) != 0x13 } - pub {const} fn makedev(major: i32, minor: i32) -> dev_t { - (major << 24) | minor + pub {const} fn makedev(major: u32, minor: u32) -> dev_t { + ((major << 24) | minor) as dev_t } - pub {const} fn major(dev: dev_t) -> i32 { - (dev >> 24) & 0xff + pub {const} fn major(dev: u32) -> i32 { + ((dev >> 24) & 0xff) as i32 } - pub {const} fn minor(dev: dev_t) -> i32 { - dev & 0xffffff + pub {const} fn minor(dev: u32) -> i32 { + (dev & 0xffffff) as i32 } }