nacho 02/04/12 14:55:05
Modified: jk/native2/server/apache2 jk_apache2.h jk_logger_apache2.c
jk_service_apache2.c
Log:
Fixes for Win32 compatibility, 72 warnings left
Revision Changes Path
1.6 +2 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h
Index: jk_apache2.h
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_apache2.h 18 Mar 2002 18:46:27 -0000 1.5
+++ jk_apache2.h 12 Apr 2002 21:55:05 -0000 1.6
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.5 $
+ * Version: $Revision: 1.6 $
*/
#include "jk_global.h"
@@ -75,7 +75,7 @@
int jk2_service_apache2_init(jk_env_t *env, jk_ws_service_t *s);
-int jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result, char *type, char *name);
int jk2_pool_apr_factory(jk_env_t *env, jk_pool_t *pool,
1.18 +7 -6
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c
Index: jk_logger_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_logger_apache2.c 2 Apr 2002 19:03:22 -0000 1.17
+++ jk_logger_apache2.c 12 Apr 2002 21:55:05 -0000 1.18
@@ -88,7 +88,7 @@
#define HUGE_BUFFER_SIZE (8*1024)
-static int jk2_logger_apache2_log(jk_env_t *env, jk_logger_t *l,
+static int JK_METHOD jk2_logger_apache2_log(jk_env_t *env, jk_logger_t *l,
int level,
const char *what)
{
@@ -96,21 +96,21 @@
}
-static int jk2_logger_apache2_init(jk_env_t *env, jk_logger_t *_this)
+static int JK_METHOD jk2_logger_apache2_init(jk_env_t *env, jk_logger_t *_this)
{
return JK_TRUE;
}
-static int jk2_logger_apache2_close(jk_env_t *env, jk_logger_t *_this)
+static int JK_METHOD jk2_logger_apache2_close(jk_env_t *env, jk_logger_t *_this)
{
return JK_TRUE;
}
-static int jk2_logger_apache2_jkVLog(jk_env_t *env, jk_logger_t *l,
+static int JK_METHOD jk2_logger_apache2_jkVLog(jk_env_t *env, jk_logger_t *l,
const char *file,
int line,
int level,
- char *fmt,
+ const char *fmt,
va_list args)
{
/* XXX map jk level to apache level */
@@ -198,7 +198,8 @@
-int jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result,
+int JK_METHOD
+jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result,
char *type, char *name)
{
jk_logger_t *l = (jk_logger_t *)pool->calloc(env, pool,
1.15 +2 -2
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_service_apache2.c 2 Apr 2002 19:03:22 -0000 1.14
+++ jk_service_apache2.c 12 Apr 2002 21:55:05 -0000 1.15
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.14 $
+ * Version: $Revision: 1.15 $
*/
#include "apu_compat.h"
@@ -308,7 +308,7 @@
/* Utility functions */
/* ========================================================================= */
-static int jk2_get_content_length(jk_env_t *env, request_rec *r)
+static unsigned jk2_get_content_length(jk_env_t *env, request_rec *r)
{
if(r->clength > 0) {
return r->clength;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
