Skip to content

Commit f480703

Browse files
committed
Fix makedev function signature on Apple targets
1 parent 9cf1a1c commit f480703

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/unix/bsd/apple/mod.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
//! This covers *-apple-* triples currently
44
55
use crate::prelude::*;
6-
use crate::{
7-
cmsghdr,
8-
off_t,
9-
};
6+
use crate::{cmsghdr, off_t};
107

118
pub type wchar_t = i32;
129
pub type clock_t = c_ulong;
@@ -5056,16 +5053,16 @@ safe_f! {
50565053
_WSTATUS(status) == _WSTOPPED && WSTOPSIG(status) != 0x13
50575054
}
50585055

5059-
pub const fn makedev(major: i32, minor: i32) -> dev_t {
5060-
(major << 24) | minor
5056+
pub const fn makedev(major: u32, minor: u32) -> dev_t {
5057+
((major << 24) | minor) as dev_t
50615058
}
50625059

5063-
pub const fn major(dev: dev_t) -> i32 {
5064-
(dev >> 24) & 0xff
5060+
pub const fn major(dev: u32) -> i32 {
5061+
((dev >> 24) & 0xff) as i32
50655062
}
50665063

5067-
pub const fn minor(dev: dev_t) -> i32 {
5068-
dev & 0xffffff
5064+
pub const fn minor(dev: u32) -> i32 {
5065+
(dev & 0xffffff) as i32
50695066
}
50705067
}
50715068

0 commit comments

Comments
 (0)