authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-10 18:47:02-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-11 12:48:17-07:00
logdd4ca88ca7a350189a27beb272e9869d2be0026e
tree3371b4803bbe6a28e44aa1a5aaa43f265f0989fe
parentd1ad126e345de106b435c16ca6cf49ce9a4a14f1

std: fix compile error bitrot

These were revealed in an earlier commit in this branch that removed a workaround disabling Windows std lib files from being tested.

3 files changed, 3 insertions(+), 3 deletions(-)

lib/std/os/windows.zig+1-1
...@@ -1983,7 +1983,7 @@ pub fn loadWinsockExtensionFunction(comptime T: type, sock: ws2_32.SOCKET, guid:...@@ -1983,7 +1983,7 @@ pub fn loadWinsockExtensionFunction(comptime T: type, sock: ws2_32.SOCKET, guid:
1983 ws2_32.SIO_GET_EXTENSION_FUNCTION_POINTER,1983 ws2_32.SIO_GET_EXTENSION_FUNCTION_POINTER,
1984 @ptrCast(*const anyopaque, &guid),1984 @ptrCast(*const anyopaque, &guid),
1985 @sizeOf(GUID),1985 @sizeOf(GUID),
1986 &function,1986 @intToPtr(?*anyopaque, @ptrToInt(function)),
1987 @sizeOf(T),1987 @sizeOf(T),
1988 &num_bytes,1988 &num_bytes,
1989 null,1989 null,
lib/std/os/windows/ws2_32.zig+1-1
...@@ -2344,6 +2344,6 @@ pub extern "ws2_32" fn getnameinfo(...@@ -2344,6 +2344,6 @@ pub extern "ws2_32" fn getnameinfo(
2344 Flags: i32,2344 Flags: i32,
2345) callconv(WINAPI) i32;2345) callconv(WINAPI) i32;
23462346
2347pub extern "IPHLPAPI" fn if_nametoindex(2347pub extern "iphlpapi" fn if_nametoindex(
2348 InterfaceName: [*:0]const u8,2348 InterfaceName: [*:0]const u8,
2349) callconv(WINAPI) u32;2349) callconv(WINAPI) u32;
lib/std/x/os/socket_windows.zig+1-1
...@@ -27,7 +27,7 @@ pub fn Mixin(comptime Socket: type) type {...@@ -27,7 +27,7 @@ pub fn Mixin(comptime Socket: type) type {
27 return switch (ws2_32.WSAGetLastError()) {27 return switch (ws2_32.WSAGetLastError()) {
28 .WSANOTINITIALISED => {28 .WSANOTINITIALISED => {
29 _ = try windows.WSAStartup(2, 2);29 _ = try windows.WSAStartup(2, 2);
30 return Socket.init(domain, socket_type, protocol, flags);30 return init(domain, socket_type, protocol, flags);
31 },31 },
32 .WSAEAFNOSUPPORT => error.AddressFamilyNotSupported,32 .WSAEAFNOSUPPORT => error.AddressFamilyNotSupported,
33 .WSAEMFILE => error.ProcessFdQuotaExceeded,33 .WSAEMFILE => error.ProcessFdQuotaExceeded,