Skip to content

Port to windows-sys #102

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

Merged
merged 1 commit into from
Nov 27, 2022
Merged

Port to windows-sys #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ autocfg = "1"
libc = "0.2.77"

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.9", features = ["winsock2"] }
windows-sys = { version = "0.42", features = ["Win32_Networking_WinSock"] }

[dev-dependencies]
async-channel = "1"
Expand Down
15 changes: 4 additions & 11 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,17 +681,10 @@ impl<T: AsRawSocket> Async<T> {

// Put the socket in non-blocking mode.

use winapi::ctypes;
use winapi::um::winsock2;

let mut nonblocking = true as ctypes::c_ulong;
let res = unsafe {
winsock2::ioctlsocket(
sock as winsock2::SOCKET,
winsock2::FIONBIO,
&mut nonblocking,
)
};
use windows_sys::Win32::Networking::WinSock;

let mut nonblocking = true as _;
let res = unsafe { WinSock::ioctlsocket(sock as _, WinSock::FIONBIO, &mut nonblocking) };
if res != 0 {
return Err(io::Error::last_os_error());
}
Expand Down