wrowe 01/04/02 10:54:03
Modified: network_io/win32 sendrecv.c sockopt.c
Log:
Catch Jeff :-)
More warnings eliminated from usec to msec conversions
Revision Changes Path
1.36 +4 -2 apr/network_io/win32/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/sendrecv.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sendrecv.c 2001/03/31 12:43:38 1.35
+++ sendrecv.c 2001/04/02 17:54:01 1.36
@@ -330,10 +330,12 @@
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;
1.33 +1 -1 apr/network_io/win32/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/sockopt.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sockopt.c 2001/02/16 04:16:04 1.32
+++ sockopt.c 2001/04/02 17:54:02 1.33
@@ -177,7 +177,7 @@
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;
