Sigh. I forgot to update the patch file with the updated header... Just need to move the POLL_USES_* stuff down to its own if/else..
@@ -46,16 +46,21 @@ #define HAS_PIPES(dt) (dt == APR_POLL_FILE) ? 1 : 0 #endif -/* Choose the best method platform specific to use in apr_pollset */ +/* Choose the best platform specific method to use in apr_pollset_* */ #ifdef HAVE_KQUEUE #define POLLSET_USES_KQUEUE #elif defined(HAVE_EPOLL) #define POLLSET_USES_EPOLL #elif defined(HAVE_POLL) #define POLLSET_USES_POLL -#define POLL_USES_POLL #else #define POLLSET_USES_SELECT +#endif + +/* Choose the best platform specific method to use in apr_poll() */ +#ifdef HAVE_POLL +#define POLL_USES_POLL +#else #define POLL_USES_SELECT #endif -Paul
