From 1fdf17c9a160e3525012e8c91278b68988fcd11d Mon Sep 17 00:00:00 2001 From: shikokuchuo <53399081+shikokuchuo@users.noreply.github.com> Date: Tue, 1 Oct 2024 23:51:37 +0100 Subject: [PATCH 1/2] fix int-to-pointer conversion warning (cherry picked from commit 9d0b023b39aae37adb6e5cb1a2b926777ffd2023) --- src/platform/windows/win_tcpconn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/windows/win_tcpconn.c b/src/platform/windows/win_tcpconn.c index 0e74ccfd8..eaae822ab 100644 --- a/src/platform/windows/win_tcpconn.c +++ b/src/platform/windows/win_tcpconn.c @@ -260,8 +260,8 @@ tcp_close(void *arg) c->s = INVALID_SOCKET; if (s != INVALID_SOCKET) { - CancelIoEx(s, &c->send_io.olpd); - CancelIoEx(s, &c->recv_io.olpd); + CancelIoEx((HANDLE) s, &c->send_io.olpd); + CancelIoEx((HANDLE) s, &c->recv_io.olpd); shutdown(s, SD_BOTH); closesocket(s); } From 78e647a02daec6231bb279a9f56cfc054a9df107 Mon Sep 17 00:00:00 2001 From: shikokuchuo <53399081+shikokuchuo@users.noreply.github.com> Date: Tue, 1 Oct 2024 23:56:14 +0100 Subject: [PATCH 2/2] fix maybe uninitialized warning (cherry picked from commit 3cfd6ab21bfb8b02fde1e976fc0bf50bf729c8ab) --- src/platform/windows/win_ipclisten.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/platform/windows/win_ipclisten.c b/src/platform/windows/win_ipclisten.c index 84efe4013..e81f4b467 100644 --- a/src/platform/windows/win_ipclisten.c +++ b/src/platform/windows/win_ipclisten.c @@ -92,6 +92,7 @@ ipc_accept_start(ipc_listener *l) if (l->closed) { nni_aio_list_remove(aio); nni_aio_finish_error(aio, NNG_ECLOSED); + rv = NNG_ECLOSED; } else if (ConnectNamedPipe(l->f, &l->io.olpd)) { rv = 0; } else if ((rv = GetLastError()) == ERROR_IO_PENDING) {