tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shac...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/native/apache1.3 mod_jk.c mod_jk.dsp
Date Tue, 30 May 2000 14:01:32 GMT
shachor     00/05/30 07:01:29

  Modified:    src/native/apache1.3 mod_jk.c mod_jk.dsp
  Log:
  Minor compile warnings on Linux
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-tomcat/src/native/apache1.3/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/apache1.3/mod_jk.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_jk.c	2000/04/13 13:08:25	1.1
  +++ mod_jk.c	2000/05/30 14:01:10	1.2
  @@ -320,7 +320,7 @@
       s->remote_host  = NULL_FOR_EMPTY(s->remote_host);
   
       s->remote_addr  = NULL_FOR_EMPTY(r->connection->remote_ip);
  -    s->server_name  = (r->hostname ? r->server->server_hostname : r->hostname);
  +    s->server_name  = (char *)(r->hostname ? r->server->server_hostname : r->hostname);
       s->server_port  = r->server->port;
       s->server_software = (char *)ap_get_server_version();
   
  @@ -393,7 +393,7 @@
        * Add the new worker to the alias map.
        */
       char *old;
  -    map_put(conf->uri_to_context, context, worker, &old);
  +    map_put(conf->uri_to_context, context, worker, (void **)&old);
       return NULL;
   }
   
  
  
  
  1.3       +4 -4      jakarta-tomcat/src/native/apache1.3/mod_jk.dsp
  
  Index: mod_jk.dsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/apache1.3/mod_jk.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_jk.dsp	2000/05/19 07:05:51	1.2
  +++ mod_jk.dsp	2000/05/30 14:01:10	1.3
  @@ -104,10 +104,6 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=..\jk\jk_ajp23_worker.c
  -# End Source File
  -# Begin Source File
  -
   SOURCE=..\jk\jk_connect.c
   # End Source File
   # Begin Source File
  @@ -221,6 +217,10 @@
   # Begin Source File
   
   SOURCE=..\jk\jk_worker.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\jk\jk_worker_list.h
   # End Source File
   # End Group
   # Begin Group "Resource Files"
  
  
  

Mime
View raw message