Ooopsie. Some unintended things slipped in.

Backing them out.
Sorry.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61730 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 1 insertions, 44 deletions

diff --git a/configure.in b/configure.in
index 5c1a20936..b8c1b6711 100644
--- a/configure.in
+++ b/configure.in
@@ -330,7 +330,6 @@ esac
 AC_SUBST(threads)
 AC_SUBST(have_sigwait)
 
-AC_CHECK_FUNCS(kqueue)
 AC_CHECK_FUNCS(poll)
 
 dnl #----------------------------- Checking for missing POSIX thread functions
@@ -557,7 +556,6 @@ APR_FLAG_HEADERS(
     net/errno.h		\
     netinet/in.h	\
     sys/file.h		\
-    sys/event.h		\
     sys/mman.h		\
     sys/poll.h		\
     sys/resource.h	\
diff --git a/include/arch/unix/networkio.h b/include/arch/unix/networkio.h
index 0b1125ab7..5d983bd80 100644
--- a/include/arch/unix/networkio.h
+++ b/include/arch/unix/networkio.h
@@ -69,9 +69,6 @@
 #if APR_HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif
-#ifdef HAVE_SYS_EVENT_H
-#include <sys/event.h>
-#endif
 #ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>
 #endif
diff --git a/network_io/unix/poll.c b/network_io/unix/poll.c
index b6709c300..cfc5d44f7 100644
--- a/network_io/unix/poll.c
+++ b/network_io/unix/poll.c
@@ -55,45 +55,7 @@
 #include "networkio.h"
 #include "fileio.h"
 
-#if defined(HAVE_KQUEUE)  /* FreeBSD provides kqueue, let's use it :) */
-
-apr_status_t apr_poll_setup(apr_pollfd_t **new, apr_int32_t num, apr_pool_t *cont)
-{
-    (*new) = (apr_pollfd_t *)apr_pcalloc(cont, sizeof(apr_pollfd_t) * num);
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-
-}
-
-apr_status_t apr_poll_socket_add(apr_pollfd_t *aprset,
-                               apr_socket_t *sock, apr_int16_t event)
-{
-}
-
-apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds,
-                    apr_interval_time_t timeout)
-{
-}
-
-apr_status_t apr_poll_revents_get(apr_int16_t *event, apr_socket_t *sock, apr_pollfd_t *aprset)
-{
-}
-
-apr_status_t apr_poll_socket_mask(apr_pollfd_t *aprset,
-                                  apr_socket_t *sock, apr_int16_t events)
-{
-}
-
-apr_status_t apr_poll_socket_remove(apr_pollfd_t *aprset, apr_socket_t *sock)
-{
-}
-
-apr_status_t apr_poll_socket_clear(apr_pollfd_t *aprset, apr_int16_t events)
-{
-}
-
-#elif defined(HAVE_POLL)    /* We can just use poll to do our socket polling. */
+#ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
 
 apr_status_t apr_poll_setup(apr_pollfd_t **new, apr_int32_t num, apr_pool_t *cont)
 {