Index: include/arch/unix/apr_arch_poll_private.h =================================================================== --- include/arch/unix/apr_arch_poll_private.h (revision 109892) +++ include/arch/unix/apr_arch_poll_private.h (working copy) @@ -77,10 +77,10 @@ #if APR_HAS_THREADS #include "apr_thread_mutex.h" #define pollset_lock_rings() \ - if(pollset->flags & APR_POLLSET_THREADSAFE) \ + if (pollset->flags & APR_POLLSET_THREADSAFE) \ apr_thread_mutex_lock(pollset->ring_lock); #define pollset_unlock_rings() \ - if(pollset->flags & APR_POLLSET_THREADSAFE) \ + if (pollset->flags & APR_POLLSET_THREADSAFE) \ apr_thread_mutex_unlock(pollset->ring_lock); #else #define pollset_lock_rings() Index: poll/unix/port.c =================================================================== --- poll/unix/port.c (revision 109892) +++ poll/unix/port.c (working copy) @@ -203,7 +203,7 @@ res = port_dissociate(pollset->port_fd, PORT_SOURCE_FD, fd); - if(res < 0) { + if (res < 0) { rv = APR_NOTFOUND; } @@ -284,13 +284,14 @@ pollset_unlock_rings(); - ret = port_getn(pollset->port_fd, pollset->port_set, pollset->nalloc, &nget, tvptr); + ret = port_getn(pollset->port_fd, pollset->port_set, pollset->nalloc, + &nget, tvptr); (*num) = nget; if (ret == -1) { (*num) = 0; - if(errno == ETIME || errno == EINTR) { + if (errno == ETIME || errno == EINTR) { rv = APR_TIMEUP; } else { @@ -309,7 +310,7 @@ get_revent(pollset->port_set[i].portev_events); APR_RING_INSERT_TAIL(&(pollset->add_ring), - ((pfd_elem_t*)(pollset->port_set[i].portev_user)), + (pfd_elem_t*)pollset->port_set[i].portev_user, pfd_elem_t, link); }