diff options
| author | Yann Ylavic <ylavic@apache.org> | 2015-03-20 00:58:42 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2015-03-20 00:58:42 +0000 |
| commit | 2531d199c3f1c619a52c95e31a05d9d860082c33 (patch) | |
| tree | 72efa886d6e1100e648188a4d55b4ded572e3ac4 /poll | |
| parent | e9bda0a73423efece26a22cd99c217108a65975d (diff) | |
| download | apr-2531d199c3f1c619a52c95e31a05d9d860082c33.tar.gz | |
Follow up to r1666341: fix timeout given to poll() from usecs to msecs.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1667914 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll')
| -rw-r--r-- | poll/unix/poll.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/poll/unix/poll.c b/poll/unix/poll.c index a11e7a932..4414ee107 100644 --- a/poll/unix/poll.c +++ b/poll/unix/poll.c @@ -251,13 +251,14 @@ static apr_status_t impl_pollset_poll(apr_pollset_t *pollset, } 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; |