mturk 2003/06/09 03:57:51
Modified: jk/native2/common jk_logger_file.c jk_logger_win32.c
jk_shm.c jk_user.c
Log:
Few paches from Gunter to compile under NETWARE.
Revision Changes Path
1.38 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_logger_file.c 4 Feb 2003 07:39:59 -0000 1.37
+++ jk_logger_file.c 9 Jun 2003 10:57:51 -0000 1.38
@@ -344,7 +344,7 @@
jk2_logger_file_setTimeStr(env,buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
if( level >= JK_LOG_DEBUG_LEVEL )
- used += _snprintf(&buf[used], HUGE_BUFFER_SIZE, " (%5s) [%s (%d)]: ",
slevel, f, line);
+ used += snprintf(&buf[used], HUGE_BUFFER_SIZE, " (%5s) [%s (%d)]: ",
slevel, f, line);
#elif defined(NETWARE) /* until we get a snprintf function */
buf = (char *) malloc(HUGE_BUFFER_SIZE);
if (NULL == buf)
@@ -365,7 +365,7 @@
}
#ifdef WIN32
- rc = _vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
+ rc = vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
#elif defined(NETWARE) /* until we get a vsnprintf function */
rc = vsprintf(buf + used, fmt, args);
#else
1.9 +1 -0 jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c
Index: jk_logger_win32.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_logger_win32.c 4 Feb 2003 07:39:59 -0000 1.8
+++ jk_logger_win32.c 9 Jun 2003 10:57:51 -0000 1.9
@@ -229,6 +229,7 @@
}
#else
+int JK_METHOD
jk2_logger_win32_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t *result,
const char *type, const char *name)
{
1.34 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jk_shm.c 4 Mar 2003 07:18:04 -0000 1.33
+++ jk_shm.c 9 Jun 2003 10:57:51 -0000 1.34
@@ -95,7 +95,7 @@
#define SHM_DUMP 6
-#ifdef APR_HAS_MMAP
+#if (APR_HAS_MMAP == 1)
static int JK_METHOD jk2_shm_destroy(jk_env_t *env, jk_shm_t *shm)
{
1.4 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_user.c
Index: jk_user.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_user.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_user.c 4 Feb 2003 07:39:58 -0000 1.3
+++ jk_user.c 9 Jun 2003 10:57:51 -0000 1.4
@@ -59,7 +59,7 @@
#include "jk_map.h"
#include "jk_pool.h"
-#ifndef WIN32
+#if !(defined(WIN32) || defined(NETWARE))
#include <unistd.h>
#include <pwd.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
