diff options
| author | rooneg <rooneg@13f79535-47bb-0310-9956-ffa450edef68> | 2006-01-30 01:30:44 +0000 |
|---|---|---|
| committer | rooneg <rooneg@13f79535-47bb-0310-9956-ffa450edef68> | 2006-01-30 01:30:44 +0000 |
| commit | 467af56e0fc313a35672d2b7f6549663ce9541fe (patch) | |
| tree | 9bcf703c0ce3468f2ab356caf06d22d6c2d8aed7 | |
| parent | 3e18a462465aaf98948b470e760d7de735942771 (diff) | |
| download | libapr-467af56e0fc313a35672d2b7f6549663ce9541fe.tar.gz | |
Merge r357641 to the 0.9.x branch, as it's needed to make r355812 compile.
Original log message:
Cast away an emit (we reduced by 10 bits already) and correct
a typo in the timeout-on-read patch committed last week.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@373410 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | file_io/win32/readwrite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c index 4b918cf9b..51ed2fbe7 100644 --- a/file_io/win32/readwrite.c +++ b/file_io/win32/readwrite.c @@ -318,10 +318,10 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a timeout_ms = INFINITE; } else { - timeout_ms = thefile->timeout / 1000; + timeout_ms = (DWORD)(thefile->timeout / 1000); } - rv = WaitForSingleObject(thefile->pOverlapped->hEvent, timemilliseconds); + rv = WaitForSingleObject(thefile->pOverlapped->hEvent, timeout_ms); switch (rv) { case WAIT_OBJECT_0: GetOverlappedResult(thefile->filehand, thefile->pOverlapped, nbytes, TRUE); |