authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-21 10:26:41-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-29 06:20:51-07:00
logdab8dd5e0306af4ef9b2388cfa8012ea596920ae
tree9a1d3733b0a63a76a333195f3753636c886632cb
parent0107e584ef4c8071b9ab71f20aae83a5cfb91921

std.os.windows.ws2_32: remove 'A' variants


1 files changed, 11 insertions(+), 113 deletions(-)

lib/std/os/windows/ws2_32.zig+11-113
...@@ -1080,31 +1080,18 @@ pub const WSANETWORKEVENTS = extern struct {...@@ -1080,31 +1080,18 @@ pub const WSANETWORKEVENTS = extern struct {
1080 iErrorCode: [10]i32,1080 iErrorCode: [10]i32,
1081};1081};
10821082
1083pub const addrinfo = addrinfoa;1083pub const ADDRINFOEXW = extern struct {
1084
1085pub const addrinfoa = extern struct {
1086 flags: AI,
1087 family: i32,
1088 socktype: i32,
1089 protocol: i32,
1090 addrlen: usize,
1091 canonname: ?[*:0]u8,
1092 addr: ?*sockaddr,
1093 next: ?*addrinfo,
1094};
1095
1096pub const addrinfoexA = extern struct {
1097 flags: AI,1084 flags: AI,
1098 family: i32,1085 family: i32,
1099 socktype: i32,1086 socktype: i32,
1100 protocol: i32,1087 protocol: i32,
1101 addrlen: usize,1088 addrlen: usize,
1102 canonname: [*:0]u8,1089 canonname: [*:0]u16,
1103 addr: *sockaddr,1090 addr: *sockaddr,
1104 blob: *anyopaque,1091 blob: *anyopaque,
1105 bloblen: usize,1092 bloblen: usize,
1106 provider: *GUID,1093 provider: *GUID,
1107 next: *addrinfoexA,1094 next: *ADDRINFOEXW,
1108};1095};
11091096
1110pub const sockaddr = extern struct {1097pub const sockaddr = extern struct {
...@@ -1851,18 +1838,6 @@ pub extern "ws2_32" fn WSAConnectByNameW(...@@ -1851,18 +1838,6 @@ pub extern "ws2_32" fn WSAConnectByNameW(
1851 Reserved: *OVERLAPPED,1838 Reserved: *OVERLAPPED,
1852) callconv(.winapi) BOOL;1839) callconv(.winapi) BOOL;
18531840
1854pub extern "ws2_32" fn WSAConnectByNameA(
1855 s: SOCKET,
1856 nodename: [*:0]const u8,
1857 servicename: [*:0]const u8,
1858 LocalAddressLength: ?*u32,
1859 LocalAddress: ?*sockaddr,
1860 RemoteAddressLength: ?*u32,
1861 RemoteAddress: ?*sockaddr,
1862 timeout: ?*const timeval,
1863 Reserved: *OVERLAPPED,
1864) callconv(.winapi) BOOL;
1865
1866pub extern "ws2_32" fn WSAConnectByList(1841pub extern "ws2_32" fn WSAConnectByList(
1867 s: SOCKET,1842 s: SOCKET,
1868 SocketAddress: *SOCKET_ADDRESS_LIST,1843 SocketAddress: *SOCKET_ADDRESS_LIST,
...@@ -1876,12 +1851,6 @@ pub extern "ws2_32" fn WSAConnectByList(...@@ -1876,12 +1851,6 @@ pub extern "ws2_32" fn WSAConnectByList(
18761851
1877pub extern "ws2_32" fn WSACreateEvent() callconv(.winapi) HANDLE;1852pub extern "ws2_32" fn WSACreateEvent() callconv(.winapi) HANDLE;
18781853
1879pub extern "ws2_32" fn WSADuplicateSocketA(
1880 s: SOCKET,
1881 dwProcessId: u32,
1882 lpProtocolInfo: *WSAPROTOCOL_INFOA,
1883) callconv(.winapi) i32;
1884
1885pub extern "ws2_32" fn WSADuplicateSocketW(1854pub extern "ws2_32" fn WSADuplicateSocketW(
1886 s: SOCKET,1855 s: SOCKET,
1887 dwProcessId: u32,1856 dwProcessId: u32,
...@@ -1894,12 +1863,6 @@ pub extern "ws2_32" fn WSAEnumNetworkEvents(...@@ -1894,12 +1863,6 @@ pub extern "ws2_32" fn WSAEnumNetworkEvents(
1894 lpNetworkEvents: *WSANETWORKEVENTS,1863 lpNetworkEvents: *WSANETWORKEVENTS,
1895) callconv(.winapi) i32;1864) callconv(.winapi) i32;
18961865
1897pub extern "ws2_32" fn WSAEnumProtocolsA(
1898 lpiProtocols: ?*i32,
1899 lpProtocolBuffer: ?*WSAPROTOCOL_INFOA,
1900 lpdwBufferLength: *u32,
1901) callconv(.winapi) i32;
1902
1903pub extern "ws2_32" fn WSAEnumProtocolsW(1866pub extern "ws2_32" fn WSAEnumProtocolsW(
1904 lpiProtocols: ?*i32,1867 lpiProtocols: ?*i32,
1905 lpProtocolBuffer: ?*WSAPROTOCOL_INFOW,1868 lpProtocolBuffer: ?*WSAPROTOCOL_INFOW,
...@@ -2042,15 +2005,6 @@ pub extern "ws2_32" fn WSASetEvent(...@@ -2042,15 +2005,6 @@ pub extern "ws2_32" fn WSASetEvent(
2042 hEvent: HANDLE,2005 hEvent: HANDLE,
2043) callconv(.winapi) BOOL;2006) callconv(.winapi) BOOL;
20442007
2045pub extern "ws2_32" fn WSASocketA(
2046 af: i32,
2047 @"type": i32,
2048 protocol: i32,
2049 lpProtocolInfo: ?*WSAPROTOCOL_INFOA,
2050 g: u32,
2051 dwFlags: u32,
2052) callconv(.winapi) SOCKET;
2053
2054pub extern "ws2_32" fn WSASocketW(2008pub extern "ws2_32" fn WSASocketW(
2055 af: i32,2009 af: i32,
2056 @"type": i32,2010 @"type": i32,
...@@ -2068,14 +2022,6 @@ pub extern "ws2_32" fn WSAWaitForMultipleEvents(...@@ -2068,14 +2022,6 @@ pub extern "ws2_32" fn WSAWaitForMultipleEvents(
2068 fAlertable: BOOL,2022 fAlertable: BOOL,
2069) callconv(.winapi) u32;2023) callconv(.winapi) u32;
20702024
2071pub extern "ws2_32" fn WSAAddressToStringA(
2072 lpsaAddress: *sockaddr,
2073 dwAddressLength: u32,
2074 lpProtocolInfo: ?*WSAPROTOCOL_INFOA,
2075 lpszAddressString: [*]u8,
2076 lpdwAddressStringLength: *u32,
2077) callconv(.winapi) i32;
2078
2079pub extern "ws2_32" fn WSAAddressToStringW(2025pub extern "ws2_32" fn WSAAddressToStringW(
2080 lpsaAddress: *sockaddr,2026 lpsaAddress: *sockaddr,
2081 dwAddressLength: u32,2027 dwAddressLength: u32,
...@@ -2084,14 +2030,6 @@ pub extern "ws2_32" fn WSAAddressToStringW(...@@ -2084,14 +2030,6 @@ pub extern "ws2_32" fn WSAAddressToStringW(
2084 lpdwAddressStringLength: *u32,2030 lpdwAddressStringLength: *u32,
2085) callconv(.winapi) i32;2031) callconv(.winapi) i32;
20862032
2087pub extern "ws2_32" fn WSAStringToAddressA(
2088 AddressString: [*:0]const u8,
2089 AddressFamily: i32,
2090 lpProtocolInfo: ?*WSAPROTOCOL_INFOA,
2091 lpAddress: *sockaddr,
2092 lpAddressLength: *i32,
2093) callconv(.winapi) i32;
2094
2095pub extern "ws2_32" fn WSAStringToAddressW(2033pub extern "ws2_32" fn WSAStringToAddressW(
2096 AddressString: [*:0]const u16,2034 AddressString: [*:0]const u16,
2097 AddressFamily: i32,2035 AddressFamily: i32,
...@@ -2156,30 +2094,12 @@ pub extern "ws2_32" fn WSAProviderCompleteAsyncCall(...@@ -2156,30 +2094,12 @@ pub extern "ws2_32" fn WSAProviderCompleteAsyncCall(
2156 iRetCode: i32,2094 iRetCode: i32,
2157) callconv(.winapi) i32;2095) callconv(.winapi) i32;
21582096
2159pub extern "mswsock" fn EnumProtocolsA(
2160 lpiProtocols: ?*i32,
2161 lpProtocolBuffer: *anyopaque,
2162 lpdwBufferLength: *u32,
2163) callconv(.winapi) i32;
2164
2165pub extern "mswsock" fn EnumProtocolsW(2097pub extern "mswsock" fn EnumProtocolsW(
2166 lpiProtocols: ?*i32,2098 lpiProtocols: ?*i32,
2167 lpProtocolBuffer: *anyopaque,2099 lpProtocolBuffer: *anyopaque,
2168 lpdwBufferLength: *u32,2100 lpdwBufferLength: *u32,
2169) callconv(.winapi) i32;2101) callconv(.winapi) i32;
21702102
2171pub extern "mswsock" fn GetAddressByNameA(
2172 dwNameSpace: u32,
2173 lpServiceType: *GUID,
2174 lpServiceName: ?[*:0]u8,
2175 lpiProtocols: ?*i32,
2176 dwResolution: u32,
2177 lpServiceAsyncInfo: ?*SERVICE_ASYNC_INFO,
2178 lpCsaddrBuffer: *anyopaque,
2179 lpAliasBuffer: ?[*:0]const u8,
2180 lpdwAliasBufferLength: *u32,
2181) callconv(.winapi) i32;
2182
2183pub extern "mswsock" fn GetAddressByNameW(2103pub extern "mswsock" fn GetAddressByNameW(
2184 dwNameSpace: u32,2104 dwNameSpace: u32,
2185 lpServiceType: *GUID,2105 lpServiceType: *GUID,
...@@ -2193,42 +2113,24 @@ pub extern "mswsock" fn GetAddressByNameW(...@@ -2193,42 +2113,24 @@ pub extern "mswsock" fn GetAddressByNameW(
2193 lpdwAliasBufferLength: *u32,2113 lpdwAliasBufferLength: *u32,
2194) callconv(.winapi) i32;2114) callconv(.winapi) i32;
21952115
2196pub extern "mswsock" fn GetTypeByNameA(
2197 lpServiceName: [*:0]u8,
2198 lpServiceType: *GUID,
2199) callconv(.winapi) i32;
2200
2201pub extern "mswsock" fn GetTypeByNameW(2116pub extern "mswsock" fn GetTypeByNameW(
2202 lpServiceName: [*:0]u16,2117 lpServiceName: [*:0]u16,
2203 lpServiceType: *GUID,2118 lpServiceType: *GUID,
2204) callconv(.winapi) i32;2119) callconv(.winapi) i32;
22052120
2206pub extern "mswsock" fn GetNameByTypeA(
2207 lpServiceType: *GUID,
2208 lpServiceName: [*:0]u8,
2209 dwNameLength: u32,
2210) callconv(.winapi) i32;
2211
2212pub extern "mswsock" fn GetNameByTypeW(2121pub extern "mswsock" fn GetNameByTypeW(
2213 lpServiceType: *GUID,2122 lpServiceType: *GUID,
2214 lpServiceName: [*:0]u16,2123 lpServiceName: [*:0]u16,
2215 dwNameLength: u32,2124 dwNameLength: u32,
2216) callconv(.winapi) i32;2125) callconv(.winapi) i32;
22172126
2218pub extern "ws2_32" fn getaddrinfo(2127pub extern "ws2_32" fn GetAddrInfoExW(
2219 pNodeName: ?[*:0]const u8,2128 pName: ?[*:0]const u16,
2220 pServiceName: ?[*:0]const u8,2129 pServiceName: ?[*:0]const u16,
2221 pHints: ?*const addrinfoa,2130 dwNameSpace: DWORD,
2222 ppResult: *?*addrinfoa,
2223) callconv(.winapi) i32;
2224
2225pub extern "ws2_32" fn GetAddrInfoExA(
2226 pName: ?[*:0]const u8,
2227 pServiceName: ?[*:0]const u8,
2228 dwNameSapce: u32,
2229 lpNspId: ?*GUID,2131 lpNspId: ?*GUID,
2230 hints: ?*const addrinfoexA,2132 hints: ?*const ADDRINFOEXW,
2231 ppResult: **addrinfoexA,2133 ppResult: **ADDRINFOEXW,
2232 timeout: ?*timeval,2134 timeout: ?*timeval,
2233 lpOverlapped: ?*OVERLAPPED,2135 lpOverlapped: ?*OVERLAPPED,
2234 lpCompletionRoutine: ?LPLOOKUPSERVICE_COMPLETION_ROUTINE,2136 lpCompletionRoutine: ?LPLOOKUPSERVICE_COMPLETION_ROUTINE,
...@@ -2242,12 +2144,8 @@ pub extern "ws2_32" fn GetAddrInfoExOverlappedResult(...@@ -2242,12 +2144,8 @@ pub extern "ws2_32" fn GetAddrInfoExOverlappedResult(
2242 lpOverlapped: *OVERLAPPED,2144 lpOverlapped: *OVERLAPPED,
2243) callconv(.winapi) i32;2145) callconv(.winapi) i32;
22442146
2245pub extern "ws2_32" fn freeaddrinfo(2147pub extern "ws2_32" fn FreeAddrInfoExW(
2246 pAddrInfo: ?*addrinfoa,2148 pAddrInfoEx: ?*ADDRINFOEXW,
2247) callconv(.winapi) void;
2248
2249pub extern "ws2_32" fn FreeAddrInfoEx(
2250 pAddrInfoEx: ?*addrinfoexA,
2251) callconv(.winapi) void;2149) callconv(.winapi) void;
22522150
2253pub extern "ws2_32" fn getnameinfo(2151pub extern "ws2_32" fn getnameinfo(