diff options
| author | Jeff Trawick <trawick@apache.org> | 2010-01-22 12:52:16 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2010-01-22 12:52:16 +0000 |
| commit | ffb4d0fc8ab5795abe16547914e471de5a668bde (patch) | |
| tree | 7bc521ee891e68c5578205ed41ae6d69e057a2b8 /poll/unix/port.c | |
| parent | c26ff9b7e85fd3c51a47cb583bc205237a6c2f39 (diff) | |
| download | apr-ffb4d0fc8ab5795abe16547914e471de5a668bde.tar.gz | |
fix compile failure in pollcb wakeup logic on Solaris >= 10
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@902077 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll/unix/port.c')
| -rw-r--r-- | poll/unix/port.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/poll/unix/port.c b/poll/unix/port.c index b11c54c46..2253e8bec 100644 --- a/poll/unix/port.c +++ b/poll/unix/port.c @@ -551,10 +551,10 @@ static apr_status_t impl_pollcb_poll(apr_pollcb_t *pollcb, for (i = 0; i < nget; i++) { apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset.port[i].portev_user); - if ((pollfd->flags & APR_POLLSET_WAKEABLE) && + if ((pollcb->flags & APR_POLLSET_WAKEABLE) && pollfd->desc_type == APR_POLL_FILE && - pollfd->desc.f == pollfd->wakeup_pipe[0]) { - drain_wakeup_pipe(pollfd->wakeup_pipe); + pollfd->desc.f == pollcb->wakeup_pipe[0]) { + drain_wakeup_pipe(pollcb->wakeup_pipe); return APR_EINTR; } |