Author: mturk
Date: Fri Sep 6 10:22:25 2013
New Revision: 1520528
URL: http://svn.apache.org/r1520528
Log:
Use already present defines from configure
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=1520528&r1=1520527&r2=1520528&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Fri Sep 6 10:22:25 2013
@@ -345,6 +345,7 @@ extern "C"
(tv)->tv_usec = tb.millitm * 1000; }
#define HAVE_VSNPRINTF
#define HAVE_SNPRINTF
+#define HAVE_SOCKADDR_STORAGE
#ifdef HAVE_APR
#define snprintf apr_snprintf
#define vsnprintf apr_vsnprintf
@@ -404,10 +405,10 @@ typedef int jk_sock_t;
#if defined(HAVE_APR)
#define JK_HAVE_IPV6 APR_HAVE_IPV6
#else
-#if defined(WIN32) || defined(HAVE_IPV6)
-#define JK_HAVE_IPV6 1
+#if defined(WIN32) || defined(HAVE_AF_INET6)
+#define JK_HAVE_IPV6 1
#else
-#define JK_HAVE_IPV6 0
+#define JK_HAVE_IPV6 0
#endif
#endif
@@ -431,8 +432,12 @@ struct jk_sockaddr_t {
struct sockaddr_in6 sin6;
#endif
/** Placeholder to ensure that the size of this union is not
- * dependent on whether JK_HAVE_IPV6 is defined. */
+ * dependent on whether APR_HAVE_IPV6 is defined. */
+#ifdef HAVE_SOCKADDR_STORAGE
+ struct sockaddr_storage sas;
+#else
char sas[128];
+#endif
} sa;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
