Skip to content

Commit 4ae867c

Browse files
Berrysofttgross35
authored andcommitted
Cygwin: Fix usage of f!
(backport <#4308>) [ update message to mention Cygwin - Trevor ] (cherry picked from commit cd4be97)
1 parent 0d956df commit 4ae867c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/unix/cygwin/mod.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1787,7 +1787,7 @@ pub const POSIX_SPAWN_SETSIGDEF: c_int = 0x10;
17871787
pub const POSIX_SPAWN_SETSIGMASK: c_int = 0x20;
17881788

17891789
f! {
1790-
pub fn FD_CLR(fd: c_int, set: *mut fd_set) {
1790+
pub fn FD_CLR(fd: c_int, set: *mut fd_set) -> () {
17911791
let fd = fd as usize;
17921792
let size = core::mem::size_of_val(&(*set).fds_bits[0]) * 8;
17931793
(*set).fds_bits[fd / size] &= !(1 << (fd % size));
@@ -1799,13 +1799,13 @@ f! {
17991799
((*set).fds_bits[fd / size] & (1 << (fd % size))) != 0
18001800
}
18011801

1802-
pub fn FD_SET(fd: c_int, set: *mut fd_set) {
1802+
pub fn FD_SET(fd: c_int, set: *mut fd_set) -> () {
18031803
let fd = fd as usize;
18041804
let size = core::mem::size_of_val(&(*set).fds_bits[0]) * 8;
18051805
(*set).fds_bits[fd / size] |= 1 << (fd % size);
18061806
}
18071807

1808-
pub fn FD_ZERO(set: *mut fd_set) {
1808+
pub fn FD_ZERO(set: *mut fd_set) -> () {
18091809
for slot in (*set).fds_bits.iter_mut() {
18101810
*slot = 0;
18111811
}
@@ -1826,20 +1826,20 @@ f! {
18261826
s as c_int
18271827
}
18281828

1829-
pub fn CPU_ZERO(cpuset: &mut cpu_set_t) {
1829+
pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
18301830
for slot in cpuset.bits.iter_mut() {
18311831
*slot = 0;
18321832
}
18331833
}
1834-
pub fn CPU_SET(cpu: usize, cpuset: &mut cpu_set_t) {
1834+
pub fn CPU_SET(cpu: usize, cpuset: &mut cpu_set_t) -> () {
18351835
let size_in_bits = 8 * core::mem::size_of_val(&cpuset.bits[0]);
18361836
if cpu < size_in_bits {
18371837
let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits);
18381838
cpuset.bits[idx] |= 1 << offset;
18391839
}
18401840
}
18411841

1842-
pub fn CPU_CLR(cpu: usize, cpuset: &mut cpu_set_t) {
1842+
pub fn CPU_CLR(cpu: usize, cpuset: &mut cpu_set_t) -> () {
18431843
let size_in_bits = 8 * core::mem::size_of_val(&cpuset.bits[0]);
18441844
if cpu < size_in_bits {
18451845
let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits);
@@ -1900,7 +1900,7 @@ f! {
19001900
}
19011901

19021902
pub fn CMSG_DATA(cmsg: *const cmsghdr) -> *mut c_uchar {
1903-
cmsg.offset(1).cast_mut()
1903+
cmsg.offset(1).cast_mut().cast()
19041904
}
19051905
}
19061906

0 commit comments

Comments
 (0)