Author: mturk
Date: Tue Sep 10 16:44:48 2013
New Revision: 1521546
URL: http://svn.apache.org/r1521546
Log:
Do not use APR types for common code
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1521546&r1=1521545&r2=1521546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Tue Sep 10 16:44:48 2013
@@ -64,7 +64,7 @@ static apr_pool_t *jk_apr_pool = NULL;
#endif
#ifndef INT16SZ
-#define INT16SZ sizeof(apr_int16_t)
+#define INT16SZ sizeof(short)
#endif
#if !defined(EAFNOSUPPORT) && defined(WSAEAFNOSUPPORT)
@@ -978,7 +978,7 @@ int jk_tcp_socket_recvfull(jk_sock_t sd,
*/
static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size)
{
- const apr_size_t MIN_SIZE = 16; /* space for 255.255.255.255\0 */
+ const size_t MIN_SIZE = 16; /* space for 255.255.255.255\0 */
int n = 0;
char *next = dst;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
