tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1188865 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c
Date Tue, 25 Oct 2011 19:18:22 GMT
Author: timw
Date: Tue Oct 25 19:18:21 2011
New Revision: 1188865

URL: http://svn.apache.org/viewvc?rev=1188865&view=rev
Log:
Fixing mod_jk build on Windows with strict C style variable declarations.

Modified:
    tomcat/jk/trunk/native/apache-2.0/mod_jk.c

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1188865&r1=1188864&r2=1188865&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Tue Oct 25 19:18:21 2011
@@ -246,11 +246,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;
 
 struct apache_private_data
 {
@@ -750,6 +752,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;
@@ -792,8 +795,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message