Skip to content

Commit d88e2a5

Browse files
committed
move init_winsock to nt
1 parent 08955cd commit d88e2a5

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎vm/src/stdlib/nt.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,3 +429,11 @@ macro_rules! suppress_iph {
429429
ret
430430
}};
431431
}
432+
433+
pub fn init_winsock() {
434+
static WSA_INIT: parking_lot::Once = parking_lot::Once::new();
435+
WSA_INIT.call_once(|| unsafe {
436+
let mut wsa_data = std::mem::MaybeUninit::uninit();
437+
let _ = winapi::um::winsock2::WSAStartup(0x0101, wsa_data.as_mut_ptr());
438+
})
439+
}

‎vm/src/stdlib/select.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ use crate::{PyObjectRef, PyResult, TryFromBorrowedObject, TryFromObject, Virtual
22
use std::{io, mem};
33

44
pub(crate) fn make_module(vm: &VirtualMachine) -> PyObjectRef {
5-
super::socket::init_winsock();
5+
#[cfg(windows)]
6+
super::nt::init_winsock();
7+
68
#[cfg(unix)]
79
{
810
use crate::PyClassImpl;

‎vm/src/stdlib/signal.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ pub(crate) mod _signal {
193193

194194
#[cfg(windows)]
195195
let is_socket = if fd != INVALID_WAKEUP {
196-
crate::stdlib::socket::init_winsock();
196+
crate::stdlib::nt::init_winsock();
197197
let mut res = 0i32;
198198
let mut res_size = std::mem::size_of::<i32>() as i32;
199199
let res = unsafe {

‎vm/src/stdlib/socket.rs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,7 +1819,8 @@ rustpython_common::static_cell! {
18191819
}
18201820

18211821
pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
1822-
init_winsock();
1822+
#[cfg(windows)]
1823+
super::nt::init_winsock();
18231824

18241825
let ctx = &vm.ctx;
18251826
let socket_timeout = TIMEOUT_ERROR
@@ -1979,14 +1980,3 @@ fn extend_module_platform_specific(vm: &VirtualMachine, module: &PyObjectRef) {
19791980
"sethostname" => named_function!(ctx, _socket, sethostname),
19801981
});
19811982
}
1982-
1983-
pub fn init_winsock() {
1984-
#[cfg(windows)]
1985-
{
1986-
static WSA_INIT: parking_lot::Once = parking_lot::Once::new();
1987-
WSA_INIT.call_once(|| unsafe {
1988-
let mut wsa_data = std::mem::MaybeUninit::uninit();
1989-
let _ = winapi::um::winsock2::WSAStartup(0x0101, wsa_data.as_mut_ptr());
1990-
})
1991-
}
1992-
}

0 commit comments

Comments
 (0)