tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
Date Thu, 25 Apr 2002 18:39:44 GMT
costin      02/04/25 11:39:44

  Modified:    jk/native2/include jk_global.h
  Log:
  Make JK_OK consistent with APR_SUCCESS. Use similar error code.
  
  I've also changed most of jk to use JK_OK/JK_ERR consistently. For a next
  release it should use jkThrow() maybe, but for now the JK_TRUE was too
  confusing.
  
  Revision  Changes    Path
  1.8       +35 -5     jakarta-tomcat-connectors/jk/native2/include/jk_global.h
  
  Index: jk_global.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_global.h	18 Apr 2002 22:55:36 -0000	1.7
  +++ jk_global.h	25 Apr 2002 18:39:44 -0000	1.8
  @@ -59,7 +59,7 @@
    * Description: Global definitions and include files that should exist     *
    *              anywhere                                                   *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.7 $                                               *
  + * Version:     $Revision: 1.8 $                                               *
    ***************************************************************************/
   
   #ifndef JK_GLOBAL_H
  @@ -142,6 +142,39 @@
   extern "C" {
   #endif /* __cplusplus */
   
  +/* We'll use APR whenever it's possible. However for a transition period and
  +   for essential components we can build a minimal mod_jk without APR.
  +*/
  +   
  +#ifdef HAS_APR
  +
  +#include "apr.h"
  +#include "apr_errno.h"
  +
  +#else
  +
  +/* No APR - define for forward/backward compatibility
  + */
  +
  +/* cut&paste from apr_errno.h */
  +typedef int apr_status_t;
  +#define APR_SUCCESS (0)
  +#define APR_OS_START_USEERR 21000
  +
  +typedef  unsigned char   apr_byte_t;
  +typedef  short           apr_int16_t;
  +typedef  unsigned short  apr_uint16_t;
  +typedef  int             apr_int32_t;
  +typedef  unsigned int    apr_uint32_t;
  +
  +#endif
  +    
  +#define JK_OK APR_SUCCESS
  +#define JK_ERR APR_OS_START_USEERR
  +/* Individual jk errors */
  +
  +#define JK_
  +    
   /* Some compileers support 'inline'. How to guess ?
      #define INLINE inline
    */
  @@ -156,9 +189,6 @@
   #define JK_WORKER_FILE_DEF  ("workers.properties")
   #define JK_LOG_LEVEL_DEF    ("emerg")
   
  -#define JK_OK (0)
  -#define JK_ERR (1)
  -    
   #define JK_TRUE  (1)
   #define JK_FALSE (0)
   
  @@ -215,7 +245,7 @@
       #define PATH_SEPARATOR_STR      (":")
       #define FILE_SEPARATOR_STR      ("/")
       #define PATH_ENV_VARIABLE       ("LD_LIBRARY_PATH")
  -	#define HAVE_UNIXSOCKETS
  +    #define HAVE_UNIXSOCKETS
   #endif
   
   /*
  
  
  

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