dougm 01/10/21 15:11:34
Modified: src/modules/perl modperl_filter.c modperl_handler.c
modperl_log.c modperl_perl_includes.h
Log:
tweaks so we could compile without -DPERL_CORE on win32
Revision Changes Path
1.28 +2 -1 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- modperl_filter.c 2001/10/14 17:18:10 1.27
+++ modperl_filter.c 2001/10/21 22:11:34 1.28
@@ -556,7 +556,7 @@
{
apr_bucket *bucket;
int i = 0;
-
+#ifndef WIN32
if (fp == NULL) {
fp = stderr;
}
@@ -572,4 +572,5 @@
(unsigned long)bucket->data);
i++;
}
+#endif
}
1.10 +2 -0 modperl-2.0/src/modules/perl/modperl_handler.c
Index: modperl_handler.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_handler.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- modperl_handler.c 2001/04/19 17:57:15 1.9
+++ modperl_handler.c 2001/10/21 22:11:34 1.10
@@ -215,7 +215,9 @@
if (!avp) {
/* should never happen */
+#if 0
fprintf(stderr, "PANIC: no such handler type: %d\n", type);
+#endif
return NULL;
}
1.5 +4 -0 modperl-2.0/src/modules/perl/modperl_log.c
Index: modperl_log.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_log.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- modperl_log.c 2000/06/20 16:04:40 1.4
+++ modperl_log.c 2001/10/21 22:11:34 1.5
@@ -1,9 +1,12 @@
#include "mod_perl.h"
+#undef getenv /* from XSUB.h */
+
U32 MP_debug_level = 0;
void modperl_trace(char *func, const char *fmt, ...)
{
+#ifndef WIN32 /* XXX */
va_list args;
if (func) {
@@ -13,6 +16,7 @@
va_start(args, fmt);
vfprintf(stderr, fmt, args);
va_end(args);
+#endif
}
void modperl_trace_level_set(const char *level)
1.7 +12 -0 modperl-2.0/src/modules/perl/modperl_perl_includes.h
Index: modperl_perl_includes.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_includes.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- modperl_perl_includes.h 2001/09/25 19:44:02 1.6
+++ modperl_perl_includes.h 2001/10/21 22:11:34 1.7
@@ -38,6 +38,18 @@
/* avoiding namespace collisions */
+/* from XSUB.h */
+/* mod_perl.c calls exit() in a few places */
+#undef exit
+/* modperl_tipool.c references abort() */
+#undef abort
+/* these three clash with apr bucket structure member names */
+#undef link
+#undef read
+#undef free
+/* modperl_perl.c */
+#undef getpid
+
#ifdef list
# undef list
#endif
