diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2001-04-02 17:54:02 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2001-04-02 17:54:02 +0000 |
| commit | ab49e45249aea801d4fae900c10703b800de8bcd (patch) | |
| tree | 5663f4f2d6cde3b80ba8596b7be156a62ceef34a /network_io | |
| parent | 1a9a299bc310babb767c3b8e4f9505ccff76670a (diff) | |
| download | libapr-ab49e45249aea801d4fae900c10703b800de8bcd.tar.gz | |
Catch Jeff :-)
More warnings eliminated from usec to msec conversions
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61426 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
| -rw-r--r-- | network_io/win32/sendrecv.c | 6 | ||||
| -rw-r--r-- | network_io/win32/sockopt.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c index 39bd993f8..bda92c44d 100644 --- a/network_io/win32/sendrecv.c +++ b/network_io/win32/sendrecv.c @@ -330,10 +330,12 @@ APR_DECLARE(apr_status_t) apr_sendfile(apr_socket_t *sock, apr_file_t *file, if (status == APR_FROM_OS_ERROR(ERROR_IO_PENDING)) { #ifdef WAIT_FOR_EVENT rv = WaitForSingleObject(overlapped.hEvent, - sock->timeout >= 0 ? sock->timeout : INFINITE); + (DWORD)(sock->timeout >= 0 + ? sock->timeout : INFINITE)); #else rv = WaitForSingleObject((HANDLE) sock->sock, - sock->timeout >= 0 ? sock->timeout : INFINITE); + (DWORD)(sock->timeout >= 0 + ? sock->timeout : INFINITE)); #endif if (rv == WAIT_OBJECT_0) status = APR_SUCCESS; diff --git a/network_io/win32/sockopt.c b/network_io/win32/sockopt.c index 6606d10bc..1534e584b 100644 --- a/network_io/win32/sockopt.c +++ b/network_io/win32/sockopt.c @@ -177,7 +177,7 @@ APR_DECLARE(apr_status_t) apr_getsocketopt(apr_socket_t *sock, case APR_SO_TIMEOUT: /* Convert from milliseconds (windows units) to microseconds * (APR units) */ - *on = sock->timeout * 1000; + *on = (apr_int32_t)(sock->timeout * 1000); break; case APR_SO_DISCONNECTED: *on = sock->disconnected; |