Author: mturk
Date: Wed Jan 31 00:27:06 2007
New Revision: 501763
URL: http://svn.apache.org/viewvc?view=rev&rev=501763
Log:
JNI_VERSION_1_6 if defined is missing the JDK1_1InitArgs.
Make sure it at least compiles by ifdefing the code.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c?view=diff&rev=501763&r1=501762&r2=501763
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c Wed Jan 31
00:27:06 2007
@@ -28,6 +28,8 @@
#include <jni.h>
+#if !defined(JNI_VERSION_1_6)
+
#include "jk_pool.h"
#include "jk_jni_worker.h"
#include "jk_util.h"
@@ -1236,3 +1238,4 @@
}
JK_TRACE_EXIT(l);
}
+#endif /* JNI_VERSION_1_6 */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
