Windows platform: Use WSAPoll directly.

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

2 files changed, 2 insertions, 15 deletions

diff --git a/poll/unix/poll.c b/poll/unix/poll.c
index f148f5e50..e96a53cff 100644
--- a/poll/unix/poll.c
+++ b/poll/unix/poll.c
@@ -162,11 +162,7 @@ static apr_status_t impl_pollset_create(apr_pollset_t *pollset,
     if (flags & APR_POLLSET_THREADSAFE) {                
         return APR_ENOTIMPL;
     }
-#ifdef WIN32
-    if (!APR_HAVE_LATE_DLL_FUNC(WSAPoll)) {
-        return APR_ENOTIMPL;
-    }
-#endif
+
     pollset->p = apr_palloc(p, sizeof(apr_pollset_private_t));
     pollset->p->pollset = apr_palloc(p, size * sizeof(struct pollfd));
     pollset->p->query_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
@@ -322,11 +318,6 @@ static apr_status_t impl_pollcb_create(apr_pollcb_t *pollcb,
     return APR_ENOTIMPL;
 #else
     pollcb->fd = -1;
-#ifdef WIN32
-    if (!APR_HAVE_LATE_DLL_FUNC(WSAPoll)) {
-        return APR_ENOTIMPL;
-    }
-#endif
 
     pollcb->pollset.ps = apr_palloc(p, size * sizeof(struct pollfd));
     pollcb->copyset = apr_palloc(p, size * sizeof(apr_pollfd_t *));
diff --git a/poll/unix/pollset.c b/poll/unix/pollset.c
index 8fa817330..13c939371 100644
--- a/poll/unix/pollset.c
+++ b/poll/unix/pollset.c
@@ -111,11 +111,7 @@ APR_DECLARE(apr_status_t) apr_pollset_create_ex(apr_pollset_t **ret_pollset,
     *ret_pollset = NULL;
 
  #ifdef WIN32
-    /* Favor WSAPoll if supported.
-     * This will work only if ws2_32.dll has WSAPoll funtion.
-     * In other cases it will fall back to select() method unless
-     * the APR_POLLSET_NODEFAULT is added to the flags.
-     */
+    /* Favor WSAPoll. */
     if (method == APR_POLLSET_DEFAULT) {
         method = APR_POLLSET_POLL;
     }