diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-01-16 01:09:37 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-01-16 01:09:37 -0800 |
| commit | 70d65fed3a230dcf17939786b5ac941423e29216 (patch) | |
| tree | ab929f1960778dbfbc56a859f7caf3c689adc391 /src/platform/windows | |
| parent | 39dbff5615631522d3ef98b83141957038502c0d (diff) | |
| download | nng-70d65fed3a230dcf17939786b5ac941423e29216.tar.gz nng-70d65fed3a230dcf17939786b5ac941423e29216.tar.bz2 nng-70d65fed3a230dcf17939786b5ac941423e29216.zip | |
Fixes for 32-bit Windows compilation.
Diffstat (limited to 'src/platform/windows')
| -rw-r--r-- | src/platform/windows/win_clock.c | 2 | ||||
| -rw-r--r-- | src/platform/windows/win_impl.h | 2 | ||||
| -rw-r--r-- | src/platform/windows/win_net.c | 4 | ||||
| -rw-r--r-- | src/platform/windows/win_thread.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/platform/windows/win_clock.c b/src/platform/windows/win_clock.c index d0d2e7ca..6cf191ee 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((DWORD)((usec + 999) / 1000)); + Sleep((DWORD) ((usec + 999) / 1000)); } diff --git a/src/platform/windows/win_impl.h b/src/platform/windows/win_impl.h index c3afef91..9de47ce4 100644 --- a/src/platform/windows/win_impl.h +++ b/src/platform/windows/win_impl.h @@ -52,7 +52,7 @@ struct nni_plat_ipcsock { }; struct nni_plat_thr { - void (__stdcall *func)(void *); + void (*func)(void *); void * arg; HANDLE handle; }; diff --git a/src/platform/windows/win_net.c b/src/platform/windows/win_net.c index 060324eb..36390053 100644 --- a/src/platform/windows/win_net.c +++ b/src/platform/windows/win_net.c @@ -201,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 = (DWORD)iovs[i].iov_len; + iov[i].len = (DWORD) iovs[i].iov_len; } i = 0; @@ -257,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 = (DWORD)iovs[i].iov_len; + iov[i].len = (DWORD) iovs[i].iov_len; } i = 0; diff --git a/src/platform/windows/win_thread.c b/src/platform/windows/win_thread.c index ef4859d6..e2568626 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 = (DWORD)(((until - now) + 999)/1000); + msec = (DWORD) (((until - now) + 999)/1000); } ok = SleepConditionVariableCS(&cv->cv, cv->cs, msec); |