Skip to content

Commit 97db885

Browse files
committed
Resolve ambiguous imports on Windows
1 parent 4e87250 commit 97db885

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

stdlib/src/socket.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ mod _socket {
4040
pub use winapi::shared::ws2def::*;
4141
pub use winapi::shared::ws2ipdef::*;
4242
pub use winapi::um::winsock2::{
43-
SD_BOTH as SHUT_RDWR, SD_RECEIVE as SHUT_RD, SD_SEND as SHUT_WR, SOCK_DGRAM, SOCK_RAW,
44-
SOCK_RDM, SOCK_SEQPACKET, SOCK_STREAM, SOL_SOCKET, SO_BROADCAST, SO_ERROR, SO_LINGER,
45-
SO_OOBINLINE, SO_REUSEADDR, SO_TYPE, *,
43+
IPPORT_RESERVED, SD_BOTH as SHUT_RDWR, SD_RECEIVE as SHUT_RD, SD_SEND as SHUT_WR,
44+
SOCK_DGRAM, SOCK_RAW, SOCK_RDM, SOCK_SEQPACKET, SOCK_STREAM, SOL_SOCKET, SO_BROADCAST,
45+
SO_ERROR, SO_EXCLUSIVEADDRUSE, SO_LINGER, SO_OOBINLINE, SO_REUSEADDR, SO_TYPE,
46+
SO_USELOOPBACK, *,
4647
};
4748
pub use winapi::um::ws2tcpip::*;
4849
}

0 commit comments

Comments
 (0)