tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common jk_registry.c jk_env.h jk_env.c
Date Sun, 11 Nov 2001 01:17:43 GMT
nacho       01/11/10 17:17:43

  Modified:    jk/native/common jk_registry.c jk_env.h jk_env.c
  Log:
  MSVC is picky about ordering, needs the "*" near the type
  
  Revision  Changes    Path
  1.4       +2 -2      jakarta-tomcat-connectors/jk/native/common/jk_registry.c
  
  Index: jk_registry.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_registry.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jk_registry.c	2001/11/08 22:51:12	1.3
  +++ jk_registry.c	2001/11/11 01:17:43	1.4
  @@ -62,7 +62,7 @@
   
   /***************************************************************************
    * Description: Worker list                                                *
  - * Version:     $Revision: 1.3 $                                           *
  + * Version:     $Revision: 1.4 $                                           *
    ***************************************************************************/
   
   /** Static declarations for all 'hardcoded' modules. This is a hack, 
  @@ -110,7 +110,7 @@
    * 
    *   For now the static registrartion should work.
    */
  -int JK_METHOD jk_registry_init(jk_env_t *env) {
  +void JK_METHOD jk_registry_init(jk_env_t *env) {
     if( env==NULL ) {
       /* XXX do something ! */
       printf("jk_registry_init: Assertion failed, env==NULL\n" );
  
  
  
  1.2       +2 -2      jakarta-tomcat-connectors/jk/native/common/jk_env.h
  
  Index: jk_env.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_env.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_env.h	2001/11/05 23:19:29	1.1
  +++ jk_env.h	2001/11/11 01:17:43	1.2
  @@ -108,7 +108,7 @@
   /** Get a pointer to the jk_env. We could support multiple 
    *  env 'instances' in future - for now it's a singleton.
    */
  -jk_env_t JK_METHOD *jk_env_getEnv( char *id );
  +jk_env_t* JK_METHOD jk_env_getEnv( char *id );
   
   
   /**
  @@ -151,7 +151,7 @@
   
   };
   
  -int JK_METHOD jk_registry_init(jk_env_t *env);
  +void JK_METHOD jk_registry_init(jk_env_t *env);
   
   
   #ifdef __cplusplus
  
  
  
  1.3       +1 -1      jakarta-tomcat-connectors/jk/native/common/jk_env.c
  
  Index: jk_env.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_env.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_env.c	2001/11/08 22:51:12	1.2
  +++ jk_env.c	2001/11/11 01:17:43	1.3
  @@ -75,7 +75,7 @@
      The env will provide access to pools, etc 
   */
   
  -jk_env_t JK_METHOD *jk_env_getEnv( char *id ) {
  +jk_env_t* JK_METHOD jk_env_getEnv( char *id ) {
     if( jk_env_singleton == NULL ) {
       jk_env_singleton=(jk_env_t *)malloc( sizeof( jk_env_t ));
       jk_env_initEnv( (jk_env_t *)jk_env_singleton, id );
  
  
  

--
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