hgomez 02/03/11 03:31:47
Modified: src/native/mod_jk/common jk_jni_worker.c
Log:
Fix bug #6817 where RTLD_GLOBAL could be used but not present
Added also support for RTLD_NOW which could be also absent...
Revision Changes Path
1.5 +13 -1 jakarta-tomcat/src/native/mod_jk/common/jk_jni_worker.c
Index: jk_jni_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/common/jk_jni_worker.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_jni_worker.c 25 Aug 2001 18:11:37 -0000 1.4
+++ jk_jni_worker.c 11 Mar 2002 11:31:47 -0000 1.5
@@ -57,7 +57,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
#if !defined(WIN32) && !defined(NETWARE)
@@ -83,6 +83,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: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
