Added an ifdef for NetWare to call the delay() function and also fixed the

data types of the local variables used in the call to WSARecv() to
conform to the prototypes in order to clean up a type mismatch problem
during compilation.


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

1 files changed, 6 insertions, 2 deletions

diff --git a/network_io/win32/poll.c b/network_io/win32/poll.c
index 6d11777f8..45100d695 100644
--- a/network_io/win32/poll.c
+++ b/network_io/win32/poll.c
@@ -119,7 +119,11 @@ APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds,
     }
 
     if (newread == NULL && newwrite == NULL && newexcept == NULL) {
+#ifdef NETWARE
+        delay((DWORD)(timeout / 1000)); /* convert microseconds into milliseconds */
+#else
         Sleep((DWORD)(timeout / 1000)); /* convert microseconds into milliseconds */
+#endif
         return APR_TIMEUP; /* TODO - get everybody in synch with Win32 apr_status_t */
     }
     else {
@@ -149,8 +153,8 @@ APR_DECLARE(apr_status_t) apr_poll_revents_get(apr_int16_t *event,
     apr_int16_t revents = 0;
     WSABUF data;
     char buf[256];
-    int dummy;
-    int flags = MSG_PEEK;
+    DWORD dummy;
+    DWORD flags = MSG_PEEK;
 
     /* We just want to PEEK at the data, so I am setting up a dummy WSABUF
      * variable here.