Author: mturk
Date: Mon Oct 7 05:50:55 2013
New Revision: 1529764
URL: http://svn.apache.org/r1529764
Log:
Add few more IPv6 defines
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=1529764&r1=1529763&r2=1529764&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Mon Oct 7 05:50:55 2013
@@ -346,6 +346,7 @@ extern "C"
#define HAVE_VSNPRINTF
#define HAVE_SNPRINTF
#define HAVE_SOCKADDR_STORAGE
+#define HAVE_AF_INET6
#ifdef HAVE_APR
#define snprintf apr_snprintf
#define vsnprintf apr_vsnprintf
@@ -403,15 +404,25 @@ typedef int jk_sock_t;
/* IPV6 support */
#if defined(HAVE_APR)
-#define JK_HAVE_IPV6 APR_HAVE_IPV6
+#define JK_HAVE_IPV6 APR_HAVE_IPV6
+#define JK_INET APR_INET
+#define JK_UNSPEC APR_UNSPEC
#else
#if defined(WIN32) || defined(HAVE_AF_INET6)
#define JK_HAVE_IPV6 1
#else
#define JK_HAVE_IPV6 0
#endif
+#define JK_INET AF_INET
+#if defined(AF_UNSPEC)
+#define JK_UNSPEC AF_UNSPEC
+#else
+#define JK_UNSPEC 0
+#endif
+#endif
+#if JK_HAVE_IPV6
+#define JK_INET6 AF_INET6
#endif
-
typedef struct jk_sockaddr_t jk_sockaddr_t;
struct jk_sockaddr_t {
@@ -432,7 +443,7 @@ struct jk_sockaddr_t {
struct sockaddr_in6 sin6;
#endif
/** Placeholder to ensure that the size of this union is not
- * dependent on whether APR_HAVE_IPV6 is defined. */
+ * dependent on whether JK_HAVE_IPV6 is defined. */
#ifdef HAVE_SOCKADDR_STORAGE
struct sockaddr_storage sas;
#else
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
