Author: rjung Date: Tue Oct 25 19:32:25 2011 New Revision: 1188878 URL: http://svn.apache.org/viewvc?rev=1188878&view=rev Log: Fixing mod_jk build on Windows with strict C style variable declarations.
Port of Tim's fix from apache-2.0 to apache-1.3. Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1188878&r1=1188877&r2=1188878&view=diff ============================================================================== --- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original) +++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Tue Oct 25 19:32:25 2011 @@ -216,11 +216,13 @@ typedef struct /* * Request specific configuration */ -typedef struct +struct jk_request_conf { rule_extension_t *rule_extensions; int jk_handled; -} jk_request_conf_t; +}; + +typedef struct jk_request_conf jk_request_conf_t; /* * The "private", or subclass portion of the web server service class for @@ -695,6 +697,7 @@ static int init_ws_service(apache_privat const char *stateless = NULL; const char *route = NULL; rule_extension_t *e; + jk_request_conf_t *rconf; /* Copy in function pointers (which are really methods) */ s->start_response = ws_start_response; @@ -738,8 +741,8 @@ static int init_ws_service(apache_privat if (conf->options & JK_OPT_FLUSHEADER) s->flush_header = 1; - jk_request_conf_t *rconf = (jk_request_conf_t *)ap_get_module_config(r->request_config, - &jk_module); + rconf = (jk_request_conf_t *)ap_get_module_config(r->request_config, &jk_module); + e = rconf->rule_extensions; if (e) { s->extension.reply_timeout = e->reply_timeout; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org