forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some duplicate symbol complaints out of ldc on windows

This commit is contained in:
Adam D. Ruppe 2023-09-14 20:58:37 -04:00
parent 7aa3d60d86
commit 4515b78c9a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cgi.d
View File

@ -4758,6 +4758,11 @@ extern(Windows) private {
alias GROUP=uint; alias GROUP=uint;
alias LPWSAPROTOCOL_INFOW = void*; alias LPWSAPROTOCOL_INFOW = void*;
SOCKET WSASocketW(int af, int type, int protocol, LPWSAPROTOCOL_INFOW lpProtocolInfo, GROUP g, DWORD dwFlags); SOCKET WSASocketW(int af, int type, int protocol, LPWSAPROTOCOL_INFOW lpProtocolInfo, GROUP g, DWORD dwFlags);
alias WSASend = arsd.core.WSASend;
alias WSARecv = arsd.core.WSARecv;
alias WSABUF = arsd.core.WSABUF;
/+
int WSASend(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPDWORD lpNumberOfBytesSent, DWORD dwFlags, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); int WSASend(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPDWORD lpNumberOfBytesSent, DWORD dwFlags, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
int WSARecv(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); int WSARecv(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
@ -4765,6 +4770,7 @@ extern(Windows) private {
ULONG len; ULONG len;
CHAR *buf; CHAR *buf;
} }
+/
alias LPWSABUF = WSABUF*; alias LPWSABUF = WSABUF*;
alias WSAOVERLAPPED = OVERLAPPED; alias WSAOVERLAPPED = OVERLAPPED;
@ -4917,7 +4923,7 @@ private class PseudoblockingOverlappedSocket : Socket {
override ptrdiff_t send(scope const(void)[] buf, SocketFlags flags) @trusted { override ptrdiff_t send(scope const(void)[] buf, SocketFlags flags) @trusted {
overlapped = overlapped.init; overlapped = overlapped.init;
buffer[0].len = cast(DWORD) buf.length; buffer[0].len = cast(DWORD) buf.length;
buffer[0].buf = cast(CHAR*) buf.ptr; buffer[0].buf = cast(ubyte*) buf.ptr;
fiber.setPostYield( () { fiber.setPostYield( () {
if(!WSASend(handle, buffer.ptr, cast(DWORD) buffer.length, null, 0, &overlapped, null)) { if(!WSASend(handle, buffer.ptr, cast(DWORD) buffer.length, null, 0, &overlapped, null)) {
if(GetLastError() != 997) { if(GetLastError() != 997) {
@ -4932,7 +4938,7 @@ private class PseudoblockingOverlappedSocket : Socket {
override ptrdiff_t receive(scope void[] buf, SocketFlags flags) @trusted { override ptrdiff_t receive(scope void[] buf, SocketFlags flags) @trusted {
overlapped = overlapped.init; overlapped = overlapped.init;
buffer[0].len = cast(DWORD) buf.length; buffer[0].len = cast(DWORD) buf.length;
buffer[0].buf = cast(CHAR*) buf.ptr; buffer[0].buf = cast(ubyte*) buf.ptr;
DWORD flags2 = 0; DWORD flags2 = 0;

2
core.d
View File

@ -6648,7 +6648,7 @@ so the end result is you keep the last ones. it wouldn't report errors if multip
+/ +/
private version(Windows) extern(Windows) { package(arsd) version(Windows) extern(Windows) {
BOOL CancelIoEx(HANDLE, LPOVERLAPPED); BOOL CancelIoEx(HANDLE, LPOVERLAPPED);
struct WSABUF { struct WSABUF {