Author: kkolinko
Date: Thu Feb 27 00:01:03 2014
New Revision: 1572359
URL: http://svn.apache.org/r1572359
Log:
Reviewing r1572120:
Simplify, as JK_HAVE_IPV6 in this case is defined several lines earlier.
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=1572359&r1=1572358&r2=1572359&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Thu Feb 27 00:01:03 2014
@@ -416,8 +416,10 @@ typedef int jk_sock_t;
#else
#if defined(WIN32) || defined(HAVE_AF_INET6)
#define JK_HAVE_IPV6 1
+#define JK_INET6 AF_INET6
#else
#define JK_HAVE_IPV6 0
+#define JK_INET6 0
#endif
#define JK_INET AF_INET
#if defined(AF_UNSPEC)
@@ -425,11 +427,6 @@ typedef int jk_sock_t;
#else
#define JK_UNSPEC 0
#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
