mturk 2004/11/11 03:56:22
Modified: jk/native/common jk_msg_buff.c jk_pool.c
Log:
Fix #if defined macros
Revision Changes Path
1.21 +5 -5 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
Index: jk_msg_buff.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_msg_buff.c 11 Nov 2004 09:45:23 -0000 1.20
+++ jk_msg_buff.c 11 Nov 2004 11:56:22 -0000 1.21
@@ -44,7 +44,7 @@
* Simple marshaling code.
*/
-#if defined (DEBUG) || (_DEBUG)
+#if defined(DEBUG) || defined(_DEBUG)
static void jk_b_dump(jk_msg_buf_t *msg, char *err)
{
int i = 0;
@@ -278,7 +278,7 @@
{
unsigned long i;
if (msg->pos + 3 > msg->len) {
-#if defined (DEBUG) || (_DEBUG)
+#if defined(DEBUG) || defined(_DEBUG)
fprintf(stderr, "jk_b_get_long::Read after end \n");
#endif
return 0xFFFFFFFF;
@@ -305,7 +305,7 @@
{
unsigned short i;
if (msg->pos + 1 > msg->len) {
-#if defined (DEBUG) || (_DEBUG)
+#if defined(DEBUG) || defined(_DEBUG)
fprintf(stderr, "jk_b_get_int::Read after end \n");
#endif
return 0xFFFF;
@@ -327,7 +327,7 @@
{
unsigned char rc;
if (msg->pos > msg->len) {
-#if defined (DEBUG) || (_DEBUG)
+#if defined(DEBUG) || defined(_DEBUG)
fprintf(stderr, "jk_b_get_byte::Read after end \n");
#endif
return 0xFF;
1.11 +5 -2 jakarta-tomcat-connectors/jk/native/common/jk_pool.c
Index: jk_pool.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_pool.c 10 Nov 2004 16:28:31 -0000 1.10
+++ jk_pool.c 11 Nov 2004 11:56:22 -0000 1.11
@@ -114,7 +114,7 @@
return rc;
}
-#if defined (DEBUG) || (_DEBUG)
+#if defined (DEBUG) || defined(_DEBUG)
void jk_dump_pool(jk_pool_t *p, FILE * f)
{
fprintf(f, "Dumping for pool [%p]\n", p);
@@ -148,6 +148,9 @@
p->dyn_size = new_dyn_size;
}
else {
+#if defined (DEBUG) || defined(_DEBUG)
+ jk_dump_pool(p, stderr)
+#endif
return NULL;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
