bnicholes 2004/07/26 16:06:45
Modified: include/arch/win32 Tag: APR_0_9_BRANCH apr_arch_networkio.h
network_io/win32 Tag: APR_0_9_BRANCH sockets.c
Log:
Since this code only applies to sendfile, make sure that it is properly
#ifdef'ed
Revision Changes Path
No revision
No revision
1.2.2.3 +2 -0 apr/include/arch/win32/apr_arch_networkio.h
Index: apr_arch_networkio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/win32/apr_arch_networkio.h,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- apr_arch_networkio.h 21 Jul 2004 21:32:54 -0000 1.2.2.2
+++ apr_arch_networkio.h 26 Jul 2004 23:06:45 -0000 1.2.2.3
@@ -41,11 +41,13 @@
int remote_addr_unknown;
apr_int32_t netmask;
apr_int32_t inherit;
+#if APR_HAS_SENDFILE
/* As of 07.20.04, the overlapped structure is only used by
* apr_socket_sendfile and that's where it will be allocated
* and initialized.
*/
OVERLAPPED *overlapped;
+#endif
sock_userdata_t *userdata;
};
No revision
No revision
1.96.2.3 +2 -0 apr/network_io/win32/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/sockets.c,v
retrieving revision 1.96.2.2
retrieving revision 1.96.2.3
diff -u -r1.96.2.2 -r1.96.2.3
--- sockets.c 21 Jul 2004 21:32:54 -0000 1.96.2.2
+++ sockets.c 26 Jul 2004 23:06:45 -0000 1.96.2.3
@@ -35,10 +35,12 @@
}
thesocket->socketdes = INVALID_SOCKET;
}
+#if APR_HAS_SENDFILE
if (thesocket->overlapped) {
CloseHandle(thesocket->overlapped->hEvent);
thesocket->overlapped = NULL;
}
+#endif
return APR_SUCCESS;
}
