tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Mladen Turk" <mt...@mappingsoft.com>
Subject [PATCH] mod_jk2 compile on WIN32
Date Mon, 27 May 2002 07:42:21 GMT

Hi, all

Here are the two patches that enables WIN32 compilation of mod_jk2.
Tested on 2.0.37-dev.

I think that module should be named mod_jk2(right?), and since use the
APR by default.
MT.


Index: jk_env.c
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.28
diff -u -r1.28 jk_env.c
--- jk_env.c	24 May 2002 04:26:00 -0000	1.28
+++ jk_env.c	27 May 2002 07:35:42 -0000
@@ -72,7 +72,7 @@
 
 /* -------------------- Env management -------------------- */
 
-static void JK_METHOD *jk2_env_getAprPool( jk_env_t *env ) {
+static void * JK_METHOD jk2_env_getAprPool( jk_env_t *env ) {
 #ifdef HAS_APR
     /* We don't want to have to recreate the scoreboard after
      * restarts, so we'll create a global pool and never clean it.



Index: mod_jk.dsp
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_
jk.dsp,v
retrieving revision 1.2
diff -u -r1.2 mod_jk.dsp
--- mod_jk.dsp	16 May 2002 20:54:57 -0000	1.2
+++ mod_jk.dsp	27 May 2002 07:36:36 -0000
@@ -43,7 +43,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "..\common" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /D "NDEBUG" /D "WIN32" /D
"_WINDOWS" /Fd"Release\mod_jk" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /D "HAS_APR" /I "..\..\common" /I
"..\..\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /D "NDEBUG" /D "WIN32" /D
"_WINDOWS" /Fd"Release\mod_jk2" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /dll
/machine:I386
-# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib
user32.lib advapi32.lib wsock32.lib /nologo /dll /machine:I386
/libpath:"$(APACHE2_HOME)\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release"
/libpath:"$(APACHE2_HOME)\lib"
+# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib
user32.lib advapi32.lib wsock32.lib /nologo /dll /machine:I386
/out:"Release/mod_jk2.so" /libpath:"$(APACHE2_HOME)\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release"
/libpath:"$(APACHE2_HOME)\lib"
 
 !ELSEIF  "$(CFG)" == "apache - Win32 Debug"
 
@@ -69,7 +69,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I
"..\include" /I "." /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "HAS_APR" /Fd"Debug\mod_jk" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "HAS_APR" /I "..\..\include"
/I "..\include" /I "." /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "HAS_APR" /Fd"Debug\mod_jk2" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +79,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib
user32.lib advapi32.lib wsock32.lib /nologo /dll /debug /machine:I386
/out:"Debug/mod_jk2.dll" /libpath:"$(APACHE2_HOME)/Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr\Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Debug"
/libpath:"$(APACHE2_HOME)\lib"
+# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib
user32.lib advapi32.lib wsock32.lib /nologo /dll /debug /machine:I386
/out:"Debug/mod_jk2.so" /libpath:"$(APACHE2_HOME)/Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr\Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Debug"
/libpath:"$(APACHE2_HOME)\lib"
 
 !ENDIF 
 
@@ -104,6 +104,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\common\jk_channel_un.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\common\jk_config.c
 # End Source File
 # Begin Source File
@@ -197,10 +201,6 @@
 # Begin Source File
 
 SOURCE=..\..\common\jk_worker_ajp13.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_worker_ctl.c
 # End Source File
 # Begin Source File
 


--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message