From 9f5d3b720384220dd4eed6c6dec2bbd767ec6a5c Mon Sep 17 00:00:00 2001 From: jtnunley Date: Sat, 26 Nov 2022 20:50:54 -0800 Subject: [PATCH] Port to windows-sys --- Cargo.toml | 2 +- src/lib.rs | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 91dcd50..3b2a768 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/src/lib.rs b/src/lib.rs index 5b2de42..d4d3bc4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -681,17 +681,10 @@ impl Async { // 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()); }