From 6d41e086647d7b872512993e4acbf411880b48d1 Mon Sep 17 00:00:00 2001 From: lithdew Date: Sun, 9 May 2021 17:36:35 +0900 Subject: [PATCH] x/os, os: fix setsockopt on windows, simplify Socket.setOption error set --- lib/std/os.zig | 2 +- lib/std/x/os/socket_windows.zig | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/std/os.zig b/lib/std/os.zig index ebd481e0c8..8bfebb362c 100644 --- a/lib/std/os.zig +++ b/lib/std/os.zig @@ -5751,7 +5751,7 @@ pub const SetSockOptError = error{ /// Set a socket's options. pub fn setsockopt(fd: socket_t, level: u32, optname: u32, opt: []const u8) SetSockOptError!void { if (builtin.os.tag == .windows) { - const rc = windows.ws2_32.setsockopt(fd, level, optname, opt.ptr, @intCast(socklen_t, opt.len)); + const rc = windows.ws2_32.setsockopt(fd, @intCast(i32, level), @intCast(i32, optname), opt.ptr, @intCast(i32, opt.len)); if (rc == windows.ws2_32.SOCKET_ERROR) { switch (windows.ws2_32.WSAGetLastError()) { .WSANOTINITIALISED => unreachable, diff --git a/lib/std/x/os/socket_windows.zig b/lib/std/x/os/socket_windows.zig index 2f739be5b4..6dd1f9a6a9 100644 --- a/lib/std/x/os/socket_windows.zig +++ b/lib/std/x/os/socket_windows.zig @@ -374,8 +374,6 @@ pub fn Mixin(comptime Socket: type) type { .WSAEFAULT => unreachable, .WSAENOTSOCK => return error.FileDescriptorNotASocket, .WSAEINVAL => return error.SocketNotBound, - .WSAENOTCONN => return error.SocketNotConnected, - .WSAESHUTDOWN => return error.AlreadyShutdown, else => |err| windows.unexpectedWSAError(err), }; }