You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/01/12 05:43:05 UTC

cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h

costin      02/01/11 20:43:04

  Modified:    jk/native2/include jk_global.h
  Log:
  In global we have a lot of platform specific stuff, added some more.
  
  There is absolutely no reason to ask the user to specify the file separator
  and all those things when we already know them.
  
  ( workerEnv.init will add them automatically to the init properties. )
  
  Revision  Changes    Path
  1.3       +19 -1     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_global.h	4 Dec 2001 18:33:50 -0000	1.2
  +++ jk_global.h	12 Jan 2002 04:43:04 -0000	1.3
  @@ -59,7 +59,7 @@
    * Description: Global definitions and include files that should exist     *
    *              anywhere                                                   *
    * Author:      Gal Shachor <sh...@il.ibm.com>                           *
  - * Version:     $Revision: 1.2 $                                               *
  + * Version:     $Revision: 1.3 $                                               *
    ***************************************************************************/
   
   #ifndef JK_GLOBAL_H
  @@ -165,6 +165,20 @@
   #define JK_SESSION_IDENTIFIER "JSESSIONID"
   #define JK_PATH_SESSION_IDENTIFIER ";jsessionid"
   
  +#if defined(WIN32)
  +    #define SO_EXTENSION "dll"
  +#else
  +  #if defined(NETWARE)
  +      #define SO_EXTENSION "nlm"
  +  #else
  +      #define SO_EXTENSION "so"
  +  #endif
  +#endif
  +
  +#ifndef ARCH
  +#define ARCH "i386"
  +#endif
  +    
   #if defined(WIN32) || defined(NETWARE)
       #define JK_METHOD __stdcall
       #define C_LEVEL_TRY_START       __try {
  @@ -172,7 +186,9 @@
       #define C_LEVEL_FINALLY_START   __finally {
       #define C_LEVEL_FINALLY_END     }
       #define PATH_SEPERATOR          (';')
  +    #define PATH_SEPARATOR_STR      (";")
       #define FILE_SEPERATOR          ('\\')
  +    #define FILE_SEPARATOR_STR      ("\\")
       #define PATH_ENV_VARIABLE       ("PATH")
   
       /* incompatible names... */
  @@ -187,6 +203,8 @@
       #define C_LEVEL_FINALLY_END     
       #define PATH_SEPERATOR          (':')
       #define FILE_SEPERATOR          ('/')
  +    #define PATH_SEPARATOR_STR      (":")
  +    #define FILE_SEPARATOR_STR      ("/")
       #define PATH_ENV_VARIABLE       ("LD_LIBRARY_PATH")
   #endif
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>