nacho 02/04/20 15:57:16
Modified: jk/native2/common jk_map.c
jk/native2/include jk_service.h
jk/native2/server/apache2 jk_logger_apache2.c
Log:
* Cometic fixes less warnings
* Some function definition fixes for win32
* ifdef not needed for win32 fixed by define
Revision Changes Path
1.17 +1 -2 jakarta-tomcat-connectors/jk/native2/common/jk_map.c
Index: jk_map.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_map.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_map.c 19 Mar 2002 04:53:40 -0000 1.16
+++ jk_map.c 20 Apr 2002 22:57:16 -0000 1.17
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: General purpose map object *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.16 $ *
+ * Version: $Revision: 1.17 $ *
***************************************************************************/
#include "jk_global.h"
@@ -147,7 +147,6 @@
const char *name, void *value)
{
int rc = JK_FALSE;
- int i;
jk_map_private_t *mPriv;
if( name==NULL )
1.11 +4 -4 jakarta-tomcat-connectors/jk/native2/include/jk_service.h
Index: jk_service.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_service.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_service.h 20 Mar 2002 23:44:00 -0000 1.10
+++ jk_service.h 20 Apr 2002 22:57:16 -0000 1.11
@@ -63,7 +63,7 @@
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Dan Milstein <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.10 $ *
+ * Version: $Revision: 1.11 $ *
***************************************************************************/
#ifndef JK_SERVICE_H
@@ -267,7 +267,7 @@
/** printf style output. Formats in the tmp buf, then calls write
*/
- void (*jkprintf)( struct jk_env *env, struct jk_ws_service *s, char *frm,... );
+ void (JK_METHOD *jkprintf)( struct jk_env *env, struct jk_ws_service *s, char
*frm,... );
/*
* Callbacks into the web server. For each, the first argument is
@@ -277,12 +277,12 @@
/* Initialize the service structure
*/
- int (*init)( struct jk_env *env, jk_ws_service_t *_this,
+ int (JK_METHOD *init)( struct jk_env *env, jk_ws_service_t *_this,
struct jk_worker *w, void *serverObj);
/* Post request cleanup.
*/
- void (*afterRequest)( struct jk_env *env, jk_ws_service_t *_this );
+ void (JK_METHOD *afterRequest)( struct jk_env *env, jk_ws_service_t *_this );
/*
* Set the response head in the server structures. This will be called
1.19 +1 -3
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_logger_apache2.c 12 Apr 2002 21:55:05 -0000 1.18
+++ jk_logger_apache2.c 20 Apr 2002 22:57:16 -0000 1.19
@@ -134,9 +134,7 @@
return JK_FALSE;
}
-#ifdef WIN32
- rc = _vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args);
-#elif defined(NETWARE) /* until we get a vsnprintf function */
+#if defined(NETWARE) /* until we get a vsnprintf function */
/* XXX Can we use a pool ? */
/* XXX It'll go away with env and per thread data !! */
buf = (char *) malloc(HUGE_BUFFER_SIZE);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
