You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2002/03/11 12:40:25 UTC

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_jni_worker.c

hgomez      02/03/11 03:40:25

  Modified:    jk/native/common jk_jni_worker.c
  Log:
  PR: Back port correction to patch 6817 where RTLD_GLOBAL
  is used but could be missing (probably outdated OS)
  
  Revision  Changes    Path
  1.10      +13 -1     jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
  
  Index: jk_jni_worker.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jk_jni_worker.c	4 Dec 2001 22:44:31 -0000	1.9
  +++ jk_jni_worker.c	11 Mar 2002 11:40:25 -0000	1.10
  @@ -59,7 +59,7 @@
    * Description: In process JNI worker                                      *
    * Author:      Gal Shachor <sh...@il.ibm.com>                           *
    * Based on:                                                               *
  - * Version:     $Revision: 1.9 $                                           *
  + * Version:     $Revision: 1.10 $                                           *
    ***************************************************************************/
   
   #if !defined(WIN32) && !defined(NETWARE)
  @@ -85,6 +85,18 @@
   
   #ifndef JNI_VERSION_1_1
   #define JNI_VERSION_1_1 0x00010001
  +#endif
  +
  +/* probably on an older system that doesn't support RTLD_NOW or RTLD_LAZY.
  + * The below define is a lie since we are really doing RTLD_LAZY since the
  + * system doesn't support RTLD_NOW.
  + */
  +#ifndef RTLD_NOW
  +#define RTLD_NOW 1
  +#endif
  +
  +#ifndef RTLD_GLOBAL
  +#define RTLD_GLOBAL 0
   #endif
   
   #define null_check(e) if ((e) == 0) return JK_FALSE
  
  
  

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