authorgravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2019-11-27 12:29:14+11:00
committergravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2019-11-27 13:01:34+11:00
log8a71f77c4a094c98c57fc3a3332bb4e17ed6febf
tree2802dc18a4f873c791dee74faa799fcd1db49515
parentedc84e7ef78831a6da154fd648740f637c8a918e
signaturelock-open Commit is signed but in an unrecognized format.

std: lie about windows socklen_t signed-ness

1 files changed, 7 insertions(+), 4 deletions(-)

lib/std/os/windows/ws2_32.zig+7-4
...@@ -110,6 +110,9 @@ pub const WSAOVERLAPPED_COMPLETION_ROUTINE = extern fn (dwError: DWORD, cbTransf...@@ -110,6 +110,9 @@ pub const WSAOVERLAPPED_COMPLETION_ROUTINE = extern fn (dwError: DWORD, cbTransf
110110
111pub const ADDRESS_FAMILY = u16;111pub const ADDRESS_FAMILY = u16;
112112
113// Microsoft use the signed c_int for this, but it should never be negative
114const socklen_t = u32;
115
113pub const AF_UNSPEC = 0;116pub const AF_UNSPEC = 0;
114pub const AF_UNIX = 1;117pub const AF_UNIX = 1;
115pub const AF_INET = 2;118pub const AF_INET = 2;
...@@ -349,12 +352,12 @@ pub extern "ws2_32" stdcallcc fn WSAIoctl(...@@ -349,12 +352,12 @@ pub extern "ws2_32" stdcallcc fn WSAIoctl(
349pub extern "ws2_32" stdcallcc fn accept(352pub extern "ws2_32" stdcallcc fn accept(
350 s: SOCKET,353 s: SOCKET,
351 addr: ?*sockaddr,354 addr: ?*sockaddr,
352 addrlen: c_int,355 addrlen: socklen_t,
353) SOCKET;356) SOCKET;
354pub extern "ws2_32" stdcallcc fn connect(357pub extern "ws2_32" stdcallcc fn connect(
355 s: SOCKET,358 s: SOCKET,
356 name: *const sockaddr,359 name: *const sockaddr,
357 namelen: c_int,360 namelen: socklen_t,
358) c_int;361) c_int;
359pub extern "ws2_32" stdcallcc fn WSARecv(362pub extern "ws2_32" stdcallcc fn WSARecv(
360 s: SOCKET,363 s: SOCKET,
...@@ -372,7 +375,7 @@ pub extern "ws2_32" stdcallcc fn WSARecvFrom(...@@ -372,7 +375,7 @@ pub extern "ws2_32" stdcallcc fn WSARecvFrom(
372 lpNumberOfBytesRecvd: ?*DWORD,375 lpNumberOfBytesRecvd: ?*DWORD,
373 lpFlags: *DWORD,376 lpFlags: *DWORD,
374 lpFrom: ?*sockaddr,377 lpFrom: ?*sockaddr,
375 lpFromlen: c_int,378 lpFromlen: socklen_t,
376 lpOverlapped: ?*WSAOVERLAPPED,379 lpOverlapped: ?*WSAOVERLAPPED,
377 lpCompletionRoutine: ?WSAOVERLAPPED_COMPLETION_ROUTINE,380 lpCompletionRoutine: ?WSAOVERLAPPED_COMPLETION_ROUTINE,
378) c_int;381) c_int;
...@@ -392,7 +395,7 @@ pub extern "ws2_32" stdcallcc fn WSASendTo(...@@ -392,7 +395,7 @@ pub extern "ws2_32" stdcallcc fn WSASendTo(
392 lpNumberOfBytesSent: ?*DWORD,395 lpNumberOfBytesSent: ?*DWORD,
393 dwFlags: DWORD,396 dwFlags: DWORD,
394 lpTo: ?*const sockaddr,397 lpTo: ?*const sockaddr,
395 iTolen: c_int,398 iTolen: socklen_t,
396 lpOverlapped: ?*WSAOVERLAPPED,399 lpOverlapped: ?*WSAOVERLAPPED,
397 lpCompletionRoutine: ?WSAOVERLAPPED_COMPLETION_ROUTINE,400 lpCompletionRoutine: ?WSAOVERLAPPED_COMPLETION_ROUTINE,
398) c_int;401) c_int;