Skip to content

Commit facdcab

Browse files
committed
fix CI error on FreeBSD
1 parent c119cb3 commit facdcab

File tree

5 files changed

+21
-23
lines changed

5 files changed

+21
-23
lines changed

src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -464,11 +464,11 @@ safe_f! {
464464

465465
f! {
466466
pub fn major(dev: ::dev_t) -> ::c_int {
467-
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff))
467+
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff)) as ::c_int
468468
}
469469

470470
pub fn minor(dev: ::dev_t) -> ::c_int {
471-
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff))
471+
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff)) as ::c_int
472472
}
473473
}
474474

src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -483,11 +483,11 @@ safe_f! {
483483

484484
f! {
485485
pub fn major(dev: ::dev_t) -> ::c_int {
486-
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff))
486+
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff)) as ::c_int
487487
}
488488

489489
pub fn minor(dev: ::dev_t) -> ::c_int {
490-
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff))
490+
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff)) as ::c_int
491491
}
492492
}
493493

src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -483,11 +483,11 @@ safe_f! {
483483

484484
f! {
485485
pub fn major(dev: ::dev_t) -> ::c_int {
486-
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff))
486+
(((dev >> 32) & 0xffffff00) | ((dev >> 8) & 0xff)) as ::c_int
487487
}
488488

489489
pub fn minor(dev: ::dev_t) -> ::c_int {
490-
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff))
490+
(((dev >> 24) & 0xff00) | (dev & 0xffff00ff)) as ::c_int
491491
}
492492
}
493493

src/unix/solarish/illumos.rs

+1-17
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,4 @@ extern "C" {
8585
pub fn pwritev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t)
8686
-> ::ssize_t;
8787
pub fn getpagesizes2(pagesize: *mut ::size_t, nelem: ::c_int) -> ::c_int;
88-
}
89-
90-
f! {
91-
pub fn major(device: ::dev_t) -> ::major_t {
92-
((device >> 8) & 0xff) as ::major_t
93-
}
94-
95-
pub fn minor(device: ::dev_t) -> ::minor_t {
96-
(device & 0xffff00ff) as ::minor_t
97-
}
98-
99-
pub fn makedev(maj: ::major_t, min: ::minor_t) -> ::dev_t {
100-
let major = maj as ::dev_t;
101-
let minor = min as ::dev_t;
102-
(major << 8) | minor
103-
}
104-
}
88+
}

src/unix/solarish/mod.rs

+14
Original file line numberDiff line numberDiff line change
@@ -2652,6 +2652,20 @@ f! {
26522652
*slot = 0;
26532653
}
26542654
}
2655+
2656+
pub fn major(device: ::dev_t) -> ::major_t {
2657+
((device >> 8) & 0xff) as ::major_t
2658+
}
2659+
2660+
pub fn minor(device: ::dev_t) -> ::minor_t {
2661+
(device & 0xffff00ff) as ::minor_t
2662+
}
2663+
2664+
pub fn makedev(maj: ::major_t, min: ::minor_t) -> ::dev_t {
2665+
let major = maj as ::dev_t;
2666+
let minor = min as ::dev_t;
2667+
(major << 8) | minor
2668+
}
26552669
}
26562670

26572671
safe_f! {

0 commit comments

Comments
 (0)