Commit e739b2b7d6b61da805bab64854b47978f872c48d | zig

2 files changed, 8 insertions(+), 8 deletions(-)

lib/std/x/os/socket_posix.zig+4-4

...	...	@@ -55,11 +55,11 @@ pub const Socket = struct {
55	55	/// Accept a pending incoming connection queued to the kernel backlog
56	56	/// of the socket.
57	57	pub fn accept(self: Socket, flags: u32) !Socket.Connection {
58		var address: os.sockaddr = undefined;
59		var address_len: u32 = @sizeOf(os.sockaddr);
	58	var address: os.sockaddr_storage = undefined;
	59	var address_len: u32 = @sizeOf(os.sockaddr_storage);
60	60
61		const socket = Socket{ .fd = try os.accept(self.fd, &address, &address_len, flags) };
62		const socket_address = Socket.Address.fromNative(@alignCast(4, &address));
	61	const socket = Socket{ .fd = try os.accept(self.fd, @ptrCast(*os.sockaddr, &address), &address_len, flags) };
	62	const socket_address = Socket.Address.fromNative(@alignCast(4, @ptrCast(*os.sockaddr, &address)));
63	63
64	64	return Socket.Connection.from(socket, socket_address);
65	65	}

lib/std/x/os/socket_windows.zig+4-4

...	...	@@ -149,10 +149,10 @@ pub const Socket = struct {
149	149	/// Accept a pending incoming connection queued to the kernel backlog
150	150	/// of the socket.
151	151	pub fn accept(self: Socket, flags: u32) !Socket.Connection {
152		var address: ws2_32.sockaddr = undefined;
153		var address_len: c_int = @sizeOf(ws2_32.sockaddr);
	152	var address: ws2_32.sockaddr_storage = undefined;
	153	var address_len: c_int = @sizeOf(ws2_32.sockaddr_storage);
154	154
155		const rc = ws2_32.accept(self.fd, &address, &address_len);
	155	const rc = ws2_32.accept(self.fd, @ptrCast(*ws2_32.sockaddr, &address), &address_len);
156	156	if (rc == ws2_32.INVALID_SOCKET) {
157	157	return switch (ws2_32.WSAGetLastError()) {
158	158	.WSANOTINITIALISED => unreachable,
...	...	@@ -169,7 +169,7 @@ pub const Socket = struct {
169	169	}
170	170
171	171	const socket = Socket.from(rc);
172		const socket_address = Socket.Address.fromNative(@alignCast(4, &address));
	172	const socket_address = Socket.Address.fromNative(@alignCast(4, @ptrCast(*ws2_32.sockaddr, &address)));
173	173
174	174	return Socket.Connection.from(socket, socket_address);
175	175	}