Author: mturk
Date: Tue Sep 28 10:05:00 2010
New Revision: 1002089
URL: http://svn.apache.org/viewvc?rev=1002089&view=rev
Log:
Fix win32 compilation
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1002089&r1=1002088&r2=1002089&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Tue Sep 28 10:05:00 2010
@@ -707,9 +707,6 @@ int jk_shutdown_socket(jk_sock_t sd, jk_
int rp = 0;
int save_errno;
int timeout = SECONDS_TO_LINGER * 1000;
-#ifndef HAVE_POLL
- struct timeval tv;
-#endif
time_t start = time(NULL);
JK_TRACE_ENTER(l);
@@ -847,8 +844,9 @@ int jk_tcp_socket_sendfull(jk_sock_t sd,
} while (JK_IS_SOCKET_ERROR(wr) && (errno == EINTR || errno ==
EAGAIN));
if (JK_IS_SOCKET_ERROR(wr)) {
+ int err;
jk_shutdown_socket(sd, l);
- int err = (errno > 0) ? -errno : errno;
+ err = (errno > 0) ? -errno : errno;
JK_TRACE_EXIT(l);
return err;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
