Author: mturk
Date: Wed Feb 26 16:04:58 2014
New Revision: 1572120
URL: http://svn.apache.org/r1572120
Log:
Ensure JK_INET6 is APR_INET6
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=1572120&r1=1572119&r2=1572120&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Wed Feb 26 16:04:58 2014
@@ -411,6 +411,7 @@ typedef int jk_sock_t;
#if defined(HAVE_APR)
#define JK_HAVE_IPV6 APR_HAVE_IPV6
#define JK_INET APR_INET
+#define JK_INET6 APR_INET6
#define JK_UNSPEC APR_UNSPEC
#else
#if defined(WIN32) || defined(HAVE_AF_INET6)
@@ -424,9 +425,11 @@ typedef int jk_sock_t;
#else
#define JK_UNSPEC 0
#endif
-#endif
#if JK_HAVE_IPV6
#define JK_INET6 AF_INET6
+#else
+#define JK_INET6 0
+#endif
#endif
typedef struct jk_sockaddr_t jk_sockaddr_t;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
