apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r373409 - /apr/apr/branches/1.2.x/file_io/win32/readwrite.c
Date Mon, 30 Jan 2006 01:29:43 GMT
Author: rooneg
Date: Sun Jan 29 17:29:40 2006
New Revision: 373409

URL: http://svn.apache.org/viewcvs?rev=373409&view=rev
Log:
Merge r357641 to the 1.2.x branch, as it's required 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.

Modified:
    apr/apr/branches/1.2.x/file_io/win32/readwrite.c

Modified: apr/apr/branches/1.2.x/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/file_io/win32/readwrite.c?rev=373409&r1=373408&r2=373409&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/file_io/win32/readwrite.c (original)
+++ apr/apr/branches/1.2.x/file_io/win32/readwrite.c Sun Jan 29 17:29:40 2006
@@ -320,10 +320,10 @@
                     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,
(LPDWORD)nbytes, TRUE);



Mime
View raw message