You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2004/03/10 13:13:31 UTC
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
hgomez 2004/03/10 04:13:31
Modified: jk/native/apache-2.0 mod_jk.c
Log:
Fix a problem with the latest iSeries Apache 2.0.47
Revision Changes Path
1.94 +10 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- mod_jk.c 24 Feb 2004 08:45:50 -0000 1.93
+++ mod_jk.c 10 Mar 2004 12:13:31 -0000 1.94
@@ -38,6 +38,7 @@
#include "http_main.h"
#include "http_log.h"
#include "util_script.h"
+
#ifdef AS400
#include "ap_charset.h"
#include "util_charset.h" /* ap_hdrs_from_ascii */
@@ -50,10 +51,17 @@
#endif
/* deprecated with apr 0.9.3 */
+
+/*
+ The latest Apache 2.0.47 for iSeries didn't export apr_filepath_name_get
+ but apr_filename_of_pathname, even if includes seems right and the APR
+ in use is 0.9.4
+*/
+
#include "apr_version.h"
#if (APR_MAJOR_VERSION == 0) && \
(APR_MINOR_VERSION <= 9) && \
- (APR_PATCH_VERSION < 3)
+ (APR_PATCH_VERSION < 3) || defined(AS400)
#define apr_filepath_name_get apr_filename_of_pathname
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
RE: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Posted by Mladen Turk <mt...@apache.org>.
> -----Original Message-----
> From: hgomez@apache.org
> jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
> +
> #ifdef AS400
> #include "ap_charset.h"
> #include "util_charset.h" /* ap_hdrs_from_ascii */
> @@ -50,10 +51,17 @@
> #endif
Is it necessary to conditionally include those two only for AS400?
What would happen if they are included always?
I'm trying to push out all platform dependent defines as much as possible.
MT.
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org