tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hgo...@apache.org
Subject svn commit: r531424 - in /tomcat/connectors/trunk/jk/native/common: jk_connect.c jk_util.c jk_util.h
Date Mon, 23 Apr 2007 10:54:28 GMT
Author: hgomez
Date: Mon Apr 23 03:54:19 2007
New Revision: 531424

URL: http://svn.apache.org/viewvc?view=rev&rev=531424
Log:
Oups fix define

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_connect.c
    tomcat/connectors/trunk/jk/native/common/jk_util.c
    tomcat/connectors/trunk/jk/native/common/jk_util.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.c?view=diff&rev=531424&r1=531423&r2=531424
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_connect.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_connect.c Mon Apr 23 03:54:19 2007
@@ -272,7 +272,7 @@
         apr_sockaddr_ip_get(&remote_ipaddr, remote_sa);
 
 		/* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE works in UTF */
-#if defined(AS400) && !defined(AS400_UTF8)
+#ifdef AS400_UTF8
         jk_ascii2ebcdic(remote_ipaddr);
 #endif
         laddr.s_addr = inet_addr(remote_ipaddr);
@@ -296,7 +296,7 @@
     }
     else {
 		/* i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE works in UTF */
-#if defined(AS400) && !defined(AS400_UTF8)
+#ifdef AS400_UTF8
         jk_ascii2ebcdic(remote_ipaddr);
 #endif
         /* If we found only digits we use inet_addr() */

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=531424&r1=531423&r2=531424
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Mon Apr 23 03:54:19 2007
@@ -1679,7 +1679,7 @@
  * For now usefull only in i5/OS V5R4 where UTF and EBCDIC mode are mixed
  */
 
-#if defined(AS400) && !defined(AS400_UTF8)
+#ifdef AS400_UTF8
 
 /* EBCDIC to ASCII translation table */
 static u_char ebcdic_to_ascii[256] =

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?view=diff&rev=531424&r1=531423&r2=531424
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Mon Apr 23 03:54:19 2007
@@ -211,7 +211,7 @@
 #define TC41_BRIDGE_TYPE    41
 #define TC50_BRIDGE_TYPE    50
 
-#if defined(AS400) && !defined(AS400_UTF8)
+#ifdef AS400_UTF8
 void jk_ascii2ebcdic(char *ptr);
 void jk_ebcdic2ascii(char *ptr);
 #endif



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message