hgomez 02/02/21 03:17:17
Modified: jk/native2/jni jk_channeljni_native.c jk_jni_aprImpl.c
Log:
Nineth Batch of jk2 renaming
Revision Changes Path
1.2 +3 -3 jakarta-tomcat-connectors/jk/native2/jni/jk_channeljni_native.c
Index: jk_channeljni_native.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_channeljni_native.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_channeljni_native.c 26 Jan 2002 07:13:02 -0000 1.1
+++ jk_channeljni_native.c 21 Feb 2002 11:17:17 -0000 1.2
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: JNI callbacks implementation for the JNI in process adapter*
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#include "jk_jnicb.h"
@@ -67,7 +67,7 @@
#include "jk_env.h"
-int jk_channel_jni_javaSendPacket
+int jk2_channel_jni_javaSendPacket
(JNIEnv *jniEnv, jobject o, jlong envJ, jlong eP, jlong s, jbyteArray data,
jint len);
@@ -80,6 +80,6 @@
(JNIEnv *jniEnv, jobject o, jlong envJ, jlong eP, jlong s, jbyteArray data,
jint len)
{
- return (jint)jk_channel_jni_javaSendPacket( jniEnv, o, envJ, eP,
+ return (jint)jk2_channel_jni_javaSendPacket( jniEnv, o, envJ, eP,
s, data, len);
}
1.6 +3 -3 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_jni_aprImpl.c 14 Jan 2002 09:36:13 -0000 1.5
+++ jk_jni_aprImpl.c 21 Feb 2002 11:17:17 -0000 1.6
@@ -113,14 +113,14 @@
return 0;
}
-static void jkSigAction(int signal) {
+static void jk2_SigAction(int signal) {
}
static struct sigaction jkAction;
/* XXX We need to: - preserve the old signal ( or get them ) - either
- implement "waitSignal" or use invocation in jkSigAction
+ implement "waitSignal" or use invocation in jk2_SigAction
Probably waitSignal() is better ( we can have a thread that waits )
*/
@@ -130,7 +130,7 @@
jobject func)
{
memset(& jkAction, 0, sizeof(jkAction));
- jkAction.sa_handler=jkSigAction;
+ jkAction.sa_handler=jk2_SigAction;
sigaction((int)bitMask, &jkAction, (void *) NULL);
return 0;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
