Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build & link on cygwin #4308

Merged
merged 2 commits into from
Mar 7, 2025
Merged

Fix build & link on cygwin #4308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd4be97
Fix usage of f!
Berrysoft Mar 7, 2025
e5f9b4e
Fix strerror_r
Berrysoft Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/unix/cygwin/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,7 +1787,7 @@ pub const POSIX_SPAWN_SETSIGDEF: c_int = 0x10;
pub const POSIX_SPAWN_SETSIGMASK: c_int = 0x20;

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

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

pub fn FD_ZERO(set: *mut fd_set) {
pub fn FD_ZERO(set: *mut fd_set) -> () {
for slot in (*set).fds_bits.iter_mut() {
*slot = 0;
}
Expand All @@ -1826,20 +1826,20 @@ f! {
s as c_int
}

pub fn CPU_ZERO(cpuset: &mut cpu_set_t) {
pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
for slot in cpuset.bits.iter_mut() {
*slot = 0;
}
}
pub fn CPU_SET(cpu: usize, cpuset: &mut cpu_set_t) {
pub fn CPU_SET(cpu: usize, cpuset: &mut cpu_set_t) -> () {
let size_in_bits = 8 * core::mem::size_of_val(&cpuset.bits[0]);
if cpu < size_in_bits {
let (idx, offset) = (cpu / size_in_bits, cpu % size_in_bits);
cpuset.bits[idx] |= 1 << offset;
}
}

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

pub fn CMSG_DATA(cmsg: *const cmsghdr) -> *mut c_uchar {
cmsg.offset(1).cast_mut()
cmsg.offset(1).cast_mut().cast()
}
}

Expand Down Expand Up @@ -2167,6 +2167,7 @@ extern "C" {
) -> *mut c_void;

pub fn memrchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
#[link_name = "__xpg_strerror_r"]
pub fn strerror_r(errnum: c_int, buf: *mut c_char, buflen: size_t) -> c_int;
pub fn strsep(string: *mut *mut c_char, delim: *const c_char) -> *mut c_char;

Expand Down
Loading