mmanders 02/04/11 14:48:19
Modified: jk/native/common jk_jni_worker.c
Log:
Updated to build for Apache 2.0 on NetWare (using LibC).
Revision Changes Path
1.11 +6 -2 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_jni_worker.c 11 Mar 2002 11:40:25 -0000 1.10
+++ jk_jni_worker.c 11 Apr 2002 21:48:19 -0000 1.11
@@ -59,7 +59,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: *
- * Version: $Revision: 1.10 $ *
+ * Version: $Revision: 1.11 $ *
***************************************************************************/
#if !defined(WIN32) && !defined(NETWARE)
@@ -79,9 +79,13 @@
#endif
#ifdef NETWARE
+#ifdef __NOVELL_LIBC__
+#include <dlfcn.h>
+#else
#include <nwthread.h>
#include <nwadv.h>
#endif
+#endif
#ifndef JNI_VERSION_1_1
#define JNI_VERSION_1_1 0x00010001
@@ -722,7 +726,7 @@
FreeLibrary(hInst);
}
-#elif defined(NETWARE)
+#elif defined(NETWARE) && !defined(__NOVELL_LIBC__)
int javaNlmHandle = FindNLMHandle("JVM");
if (0 == javaNlmHandle) {
/* if we didn't get a handle, try to load java and retry getting the */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
