You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/07/19 21:01:47 UTC
cvs commit: jakarta-tomcat/src/native/jk jk_jni_worker.c jk_pool.h jk_util.c
costin 00/07/19 12:01:46
Modified: src/native/jk jk_jni_worker.c jk_pool.h jk_util.c
Added: src/native/apache1.3 Makefile.freebsd
Log:
Minor patch to allow compilation on freebsd.
The Makefiles must be integrated ( and maybe rewritten ).
( the compilation was tested on locus )
Revision Changes Path
1.1 jakarta-tomcat/src/native/apache1.3/Makefile.freebsd
Index: Makefile.freebsd
===================================================================
## You need to edit this file - configure later :-)
APACHE_HOME=/usr/local/apache
OS=freebsd
APXS=${APACHE_HOME}/bin/apxs
A13_FLAGS=-I${APACHE_HOME}/include
## I assume this one is set up already
# JAVA_HOME=
JAVA_INCL=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS}
JAVA_LIB=-L${JAVA_HOME}/jre/lib/${ARCH} -L${JAVA_HOME}/lib/${ARCH}/native_threads
CFLAGS=-DHAVE_CONFIG_H -g -fpic -DSHARED_MODULE -O2 -D_REENTRANT -pthread -DLINUX -Wall
JK=../jk/
SRCS=jk_ajp12_worker.c jk_connect.c jk_msg_buff.c jk_util.c jk_ajp13.c \
jk_jni_worker.c jk_pool.c jk_worker.c jk_ajp13_worker.c jk_lb_worker.c \
jk_sockbuf.c jk_map.c jk_uri_worker_map.c
OBJS=${patsubst %.c,%.o,${SRCS}}
%.o: ../jk/%.c
${CC} -c ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} $< -o $@
.c.o:
${APXS} -c ${JAVA_INCL} -DFREEBSD ${A13_FLAGS} -I../jk $<
all: mod_jk.so
mod_jk.so: ${OBJS} mod_jk.o
$(APXS) -c -o mod_jk.so ${OBJS} mod_jk.o
# $(CC) -shared -o mod_jk.so ${OBJS} mod_jk.o
clean:
rm *.o *.so
1.8 +2 -5 jakarta-tomcat/src/native/jk/jk_jni_worker.c
Index: jk_jni_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/jk/jk_jni_worker.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_jni_worker.c 2000/05/31 11:24:03 1.7
+++ jk_jni_worker.c 2000/07/19 19:01:44 1.8
@@ -57,7 +57,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Based on: *
- * Version: $Revision: 1.7 $ *
+ * Version: $Revision: 1.8 $ *
***************************************************************************/
#ifndef WIN32
@@ -1076,9 +1076,6 @@
{
JNIEnv *rc = NULL;
- /* It's needed only once per thread, but there is no
- generic/good way to keep per/thread data.
-
#ifdef LINUX
linux_signal_hack();
#endif
@@ -1110,4 +1107,4 @@
jk_log(l, JK_LOG_ERROR,
"In detach_from_jvm, cannot detach from JVM.\n");
}
-}
\ No newline at end of file
+}
1.3 +3 -1 jakarta-tomcat/src/native/jk/jk_pool.h
Index: jk_pool.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/jk/jk_pool.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_pool.h 2000/05/19 06:59:00 1.2
+++ jk_pool.h 2000/07/19 19:01:44 1.3
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: Memory Pool object header file *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision: 1.2 $ *
+ * Version: $Revision: 1.3 $ *
***************************************************************************/
#ifndef _JK_POOL_H
#define _JK_POOL_H
@@ -84,6 +84,8 @@
#elif defined(SOLARIS)
typedef long long jk_pool_atom_t;
#elif defined(LINUX)
+ typedef long long jk_pool_atom_t;
+#elif defined(FREEBSD)
typedef long long jk_pool_atom_t;
#elif defined(OS2)
typedef long long jk_pool_atom_t;
1.7 +4 -2 jakarta-tomcat/src/native/jk/jk_util.c
Index: jk_util.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/jk/jk_util.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_util.c 2000/06/23 10:34:06 1.6
+++ jk_util.c 2000/07/19 19:01:46 1.7
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision: 1.6 $ *
+ * Version: $Revision: 1.7 $ *
***************************************************************************/
@@ -107,8 +107,10 @@
/* [V] Flush the dam' thing! */
fflush(p->logfile);
#ifndef WIN32
+#ifndef FREEBSD
fdatasync(fileno(p->logfile));
#endif
+#endif
}
return JK_TRUE;
@@ -701,4 +703,4 @@
s->attributes_values = NULL;
s->num_attributes = 0;
s->jvm_route = NULL;
-}
\ No newline at end of file
+}