tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_registry.c jk_registry.h
Date Mon, 14 Jan 2002 09:26:52 GMT
jfclere     02/01/14 01:26:52

  Modified:    jk/native2/common jk_registry.c jk_registry.h
  Log:
  Arrange two small problems (native2 was not compiling).
  
  Revision  Changes    Path
  1.10      +3 -2      jakarta-tomcat-connectors/jk/native2/common/jk_registry.c
  
  Index: jk_registry.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jk_registry.c	12 Jan 2002 05:09:50 -0000	1.9
  +++ jk_registry.c	14 Jan 2002 09:26:52 -0000	1.10
  @@ -63,7 +63,7 @@
   #include "jk_registry.h"
   /***************************************************************************
    * Description: Worker list                                                *
  - * Version:     $Revision: 1.9 $                                           *
  + * Version:     $Revision: 1.10 $                                           *
    ***************************************************************************/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -116,8 +116,9 @@
   #ifdef HAS_APR
     env->registerFactory( env, "channel", "apr",
                           jk_channel_apr_socket_factory );
  -#endif
  +#else
     env->registerFactory( env, "channel", "socket", jk_channel_socket_factory );
  +#endif
     
     env->registerFactory( env, "handler", "response",
                           jk_handler_response_factory );
  
  
  
  1.5       +5 -1      jakarta-tomcat-connectors/jk/native2/common/jk_registry.h
  
  Index: jk_registry.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jk_registry.h	12 Jan 2002 05:09:50 -0000	1.4
  +++ jk_registry.h	14 Jan 2002 09:26:52 -0000	1.5
  @@ -62,7 +62,7 @@
   
   /***************************************************************************
    * Description: Worker list                                                *
  - * Version:     $Revision: 1.4 $                                           *
  + * Version:     $Revision: 1.5 $                                           *
    ***************************************************************************/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -97,6 +97,10 @@
   int JK_METHOD jk_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
                                       void **result,
                                       const char *type, const char *name);
  +
  +int JK_METHOD jk_channel_jni_factory(jk_env_t *env, jk_pool_t *pool,
  +                                     void **result,
  +                                     const char *type, const char *name);
   
   int JK_METHOD jk_worker_status_factory(jk_env_t *env, jk_pool_t *pool,
                                          void **result,
  
  
  

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


Mime
View raw message