Author: timw Date: Thu Oct 21 10:52:06 2010 New Revision: 1025936 URL: http://svn.apache.org/viewvc?rev=1025936&view=rev Log: Fixing build for VS 2005 with Apache 2.0 The Apache 2.0 apr.h includes <windows.h> but doesn't include <ws2tcpip.h>, so we have to explicitly include it.
Modified: tomcat/jk/trunk/native/common/jk_global.h Modified: tomcat/jk/trunk/native/common/jk_global.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1025936&r1=1025935&r2=1025936&view=diff ============================================================================== --- tomcat/jk/trunk/native/common/jk_global.h (original) +++ tomcat/jk/trunk/native/common/jk_global.h Thu Oct 21 10:52:06 2010 @@ -117,7 +117,6 @@ extern char *strdup(const char *str); #include <winsock2.h> #include <mswsock.h> #include <mstcpip.h> -#include <ws2tcpip.h> #endif /* _WINDOWS_ */ #ifdef _WINDOWS_ #ifndef SIO_RCVALL @@ -127,6 +126,7 @@ extern char *strdup(const char *str); #include <sys/timeb.h> #include <process.h> #include <io.h> +#include <ws2tcpip.h> #else /* WIN32 */ #include <unistd.h> #if defined(NETWARE) && defined(__NOVELL_LIBC__) @@ -396,3 +396,4 @@ typedef int jk_sock_t; #endif /* __cplusplus */ #endif /* JK_GLOBAL_H */ + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org