You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2010/01/22 13:52:16 UTC

svn commit: r902077 - /apr/apr/trunk/poll/unix/port.c

Author: trawick
Date: Fri Jan 22 12:52:16 2010
New Revision: 902077

URL: http://svn.apache.org/viewvc?rev=902077&view=rev
Log:
fix compile failure in pollcb wakeup logic on Solaris >= 10

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

Modified: apr/apr/trunk/poll/unix/port.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/poll/unix/port.c?rev=902077&r1=902076&r2=902077&view=diff
==============================================================================
--- apr/apr/trunk/poll/unix/port.c (original)
+++ apr/apr/trunk/poll/unix/port.c Fri Jan 22 12:52:16 2010
@@ -551,10 +551,10 @@
         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;
             }