Various complaints found in AppVeyor build.

4 files changed, 13 insertions, 14 deletions

diff --git a/src/platform/windows/win_clock.c b/src/platform/windows/win_clock.c
index 9a2546ae..d0d2e7ca 100644
--- a/src/platform/windows/win_clock.c
+++ b/src/platform/windows/win_clock.c
@@ -22,7 +22,7 @@ nni_plat_clock(void)
 void
 nni_plat_usleep(nni_duration usec)
 {
-	Sleep((usec + 999) / 1000);
+	Sleep((DWORD)((usec + 999) / 1000));
 }
 
 
diff --git a/src/platform/windows/win_ipc.c b/src/platform/windows/win_ipc.c
index 42590ee9..86a4be03 100644
--- a/src/platform/windows/win_ipc.c
+++ b/src/platform/windows/win_ipc.c
@@ -11,6 +11,8 @@
 
 #ifdef PLATFORM_WINDOWS
 
+#include <stdio.h>
+
 // Windows has infinite numbers of error codes it seems.  We only bother
 // with the ones that are relevant to us (we think).
 static struct {
@@ -73,7 +75,7 @@ nni_plat_ipc_send(nni_plat_ipcsock *s, nni_iov *iovs, int cnt)
 	OVERLAPPED *olp = &s->send_olpd;
 
 	NNI_ASSERT(cnt <= 4);
-	for (i = 0, resid = 0; i < cnt; resid += iov[i].iov_len, i++) {
+	for (i = 0, resid = 0; i < cnt; resid += (DWORD) iov[i].iov_len, i++) {
 		iov[i].iov_len = iovs[i].iov_len;
 		iov[i].iov_buf = iovs[i].iov_buf;
 	}
@@ -84,7 +86,8 @@ nni_plat_ipc_send(nni_plat_ipcsock *s, nni_iov *iovs, int cnt)
 		nsent = 0;
 		// We limit ourselves to writing 16MB at a time.  Named Pipes
 		// on Windows have limits of between 31 and 64MB.
-		len = iov[i].iov_len > 0x1000000 ? 0x1000000 : iov[i].iov_len;
+		len = iov[i].iov_len > 0x1000000 ? 0x1000000 :
+		    (DWORD) iov[i].iov_len;
 		buf = iov[i].iov_buf;
 
 		if (!WriteFile(s->p, buf, len, NULL, olp)) {
@@ -123,7 +126,7 @@ nni_plat_ipc_recv(nni_plat_ipcsock *s, nni_iov *iovs, int cnt)
 	OVERLAPPED *olp = &s->recv_olpd;
 
 	NNI_ASSERT(cnt <= 4);
-	for (i = 0, resid = 0; i < cnt; resid += iov[i].iov_len, i++) {
+	for (i = 0, resid = 0; i < cnt; resid += (DWORD) iov[i].iov_len, i++) {
 		iov[i].iov_len = iovs[i].iov_len;
 		iov[i].iov_buf = iovs[i].iov_buf;
 	}
@@ -134,7 +137,8 @@ nni_plat_ipc_recv(nni_plat_ipcsock *s, nni_iov *iovs, int cnt)
 		nrecv = 0;
 		// We limit ourselves to writing 16MB at a time.  Named Pipes
 		// on Windows have limits of between 31 and 64MB.
-		len = iov[i].iov_len > 0x1000000 ? 0x1000000 : iov[i].iov_len;
+		len = iov[i].iov_len > 0x1000000 ? 0x1000000 :
+		    (DWORD) iov[i].iov_len;
 		buf = iov[i].iov_buf;
 
 		if (!ReadFile(s->p, buf, len, NULL, olp)) {
@@ -262,7 +266,6 @@ nni_plat_ipc_accept(nni_plat_ipcsock *s, nni_plat_ipcsock *server)
 {
 	int rv;
 	OVERLAPPED *olp = &s->conn_olpd;
-	HANDLE newp;
 	DWORD nbytes;
 
 	s->server = 1;
diff --git a/src/platform/windows/win_net.c b/src/platform/windows/win_net.c
index 48be1781..060324eb 100644
--- a/src/platform/windows/win_net.c
+++ b/src/platform/windows/win_net.c
@@ -190,7 +190,6 @@ nni_plat_tcp_send(nni_plat_tcpsock *s, nni_iov *iovs, int cnt)
 	WSABUF iov[4];    // We never have more than 3 at present
 	int i;
 	int rv;
-	DWORD offset;
 	DWORD nsent;
 	DWORD resid;
 	DWORD flags;
@@ -202,7 +201,7 @@ nni_plat_tcp_send(nni_plat_tcpsock *s, nni_iov *iovs, int cnt)
 
 	for (i = 0, resid = 0; i < cnt; resid += iov[i].len, i++) {
 		iov[i].buf = iovs[i].iov_buf;
-		iov[i].len = iovs[i].iov_len;
+		iov[i].len = (DWORD)iovs[i].iov_len;
 	}
 
 	i = 0;
@@ -247,7 +246,6 @@ nni_plat_tcp_recv(nni_plat_tcpsock *s, nni_iov *iovs, int cnt)
 	WSABUF iov[4];    // We never have more than 3 at present
 	int i;
 	int rv;
-	DWORD offset;
 	DWORD resid;
 	DWORD nrecv;
 	DWORD flags;
@@ -259,7 +257,7 @@ nni_plat_tcp_recv(nni_plat_tcpsock *s, nni_iov *iovs, int cnt)
 
 	for (i = 0, resid = 0; i < cnt; resid += iov[i].len, i++) {
 		iov[i].buf = iovs[i].iov_buf;
-		iov[i].len = iovs[i].iov_len;
+		iov[i].len = (DWORD)iovs[i].iov_len;
 	}
 
 	i = 0;
@@ -352,8 +350,7 @@ nni_plat_tcp_open(nni_plat_tcpsock *s)
 	GUID guid1 = WSAID_CONNECTEX;
 	GUID guid2 = WSAID_ACCEPTEX;
 
-	s->s = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0,
-		WSA_FLAG_NO_HANDLE_INHERIT|WSA_FLAG_OVERLAPPED);
+	s->s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (s->s == INVALID_SOCKET) {
 		rv = WSAGetLastError();
 		return (nni_winsock_error(rv));
@@ -478,7 +475,6 @@ nni_plat_tcp_connect(nni_plat_tcpsock *s, const nni_sockaddr *addr,
 	SOCKADDR_STORAGE ss;
 	SOCKADDR_STORAGE bss;
 	WSAOVERLAPPED *olp = &s->conn_olpd;
-	BOOL ok;
 	DWORD nbytes;
 	DWORD flags;
 	int rv;
diff --git a/src/platform/windows/win_thread.c b/src/platform/windows/win_thread.c
index 2dcb62fe..ef4859d6 100644
--- a/src/platform/windows/win_thread.c
+++ b/src/platform/windows/win_thread.c
@@ -95,7 +95,7 @@ nni_plat_cv_until(nni_plat_cv *cv, nni_time until)
 		msec = 0;
 	} else {
 		// times are in usec, but win32 wants millis
-		msec = ((until - now) + 999)/1000;
+		msec = (DWORD)(((until - now) + 999)/1000);
 	}
 
 	ok = SleepConditionVariableCS(&cv->cv, cv->cs, msec);