andya 01/06/22 09:59:59
Modified: jk/native/domino config.h jk_dsapi_plugin.c
Log:
Updated to take advantage of JK_VERSION. The same source now builds for TC 3.2 and
the latest development code.
Revision Changes Path
1.5 +3 -6 jakarta-tomcat-connectors/jk/native/domino/config.h
Index: config.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/domino/config.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.h 2001/06/18 14:41:17 1.4
+++ config.h 2001/06/22 16:59:57 1.5
@@ -58,17 +58,14 @@
/***************************************************************************
* Description: DSAPI plugin for Lotus Domino *
* Author: Andy Armstrong <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
#ifndef __config_h
#define __config_h
-#define TOMCAT320 320
-#define TOMCAT330 330
-#define TOMCAT400 400
-
-#define FOR_TOMCAT TOMCAT400
+#define MAKEVERSION(a, b, c, d) \
+ (((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
/* the _memicmp() function is available */
#if defined(WIN32)
1.8 +5 -5 jakarta-tomcat-connectors/jk/native/domino/jk_dsapi_plugin.c
Index: jk_dsapi_plugin.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/domino/jk_dsapi_plugin.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_dsapi_plugin.c 2001/06/18 14:41:22 1.7
+++ jk_dsapi_plugin.c 2001/06/22 16:59:58 1.8
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: DSAPI plugin for Lotus Domino *
* Author: Andy Armstrong <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.7 $ *
+ * Version: $Revision: 1.8 $ *
***************************************************************************/
/* Based on the IIS redirector by Gal Shachor <[EMAIL PROTECTED]> */
@@ -128,7 +128,7 @@
static const char *tomcatStart;
static const char *tomcatStop;
-#if FOR_TOMCAT >= TOMCAT400
+#if defined(JK_VERSION) && JK_VERSION >= MAKEVERSION(1, 2, 0, 1)
static jk_worker_env_t worker_env;
#endif
@@ -857,7 +857,7 @@
s->ssl_cipher = NULL; /* required by Servlet 2.3 Api */
s->ssl_session = NULL;
-#if FOR_TOMCAT >= TOMCAT400
+#if defined(JK_VERSION) && JK_VERSION >= MAKEVERSION(1, 2, 0, 1)
s->ssl_key_size = -1; /* required by Servlet 2.3 Api, added in jtc */
#endif
@@ -883,7 +883,7 @@
DEBUG(("SSL request\n"));
-#if FOR_TOMCAT >= TOMCAT400
+#if defined(JK_VERSION) && JK_VERSION >= MAKEVERSION(1, 2, 0, 1)
/* Read the variable into a dummy variable: we do this for the side
effect of
* reading it into workBuf.
*/
@@ -995,7 +995,7 @@
DEBUG(("About to read %s\n", workerFile));
if (map_read_properties(map, workerFile))
{
-#if FOR_TOMCAT >= TOMCAT400
+#if defined(JK_VERSION) && JK_VERSION >= MAKEVERSION(1, 2, 0, 1)
char server[256];
worker_env.uri_to_worker = uw_map;
