bnicholes 01/08/06 09:15:04
Modified: network_io/win32 poll.c
Log:
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.
Revision Changes Path
1.28 +6 -2 apr/network_io/win32/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/poll.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- poll.c 2001/07/19 04:29:58 1.27
+++ poll.c 2001/08/06 16:15:04 1.28
@@ -119,7 +119,11 @@
}
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_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.
