apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1667914 - /apr/apr/trunk/poll/unix/poll.c
Date Fri, 20 Mar 2015 00:58:43 GMT
Author: ylavic
Date: Fri Mar 20 00:58:42 2015
New Revision: 1667914

URL: http://svn.apache.org/r1667914
Log:
Follow up to r1666341: fix timeout given to poll() from usecs to msecs.

Modified:
    apr/apr/trunk/poll/unix/poll.c

Modified: apr/apr/trunk/poll/unix/poll.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/poll.c?rev=1667914&r1=1667913&r2=1667914&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/poll.c (original)
+++ apr/apr/trunk/poll/unix/poll.c Fri Mar 20 00:58:42 2015
@@ -251,13 +251,14 @@ static apr_status_t impl_pollset_poll(ap
         }
         return APR_SUCCESS;
     }
-
     if (timeout > 0) {
         timeout /= 1000;
     }
-
     ret = WSAPoll(pollset->p->pollset, pollset->nelts, (int)timeout);
 #else
+    if (timeout > 0) {
+        timeout /= 1000;
+    }
     ret = poll(pollset->p->pollset, pollset->nelts, timeout);
 #endif
     (*num) = ret;



Mime
View raw message