Hi,
I noticed with the recent changes to get mp2 to compile
with perl-5.10, a couple of #ifdef USE_ITHREADS/#endif
statements are needed to work with a non-ithread perl.
This is attached.
One question I had about this - in the present
xs/APR/Pool/APR__Pool.h, there's a "static" statement
on a line by itself. I removed that in the attached
diff, as I wasn't sure if that was a stray line, or
was to be applied to the statement following it (or
perhaps to both?).
--
best regards,
Randy
Index: src/modules/perl/mod_perl.h
===================================================================
--- src/modules/perl/mod_perl.h (revision 627863)
+++ src/modules/perl/mod_perl.h (working copy)
@@ -148,8 +148,10 @@
/* we need to hook a few internal things before APR_HOOK_REALLY_FIRST */
#define MODPERL_HOOK_REALLY_REALLY_FIRST (-20)
+#ifdef USE_ITHREADS
APR_DECLARE_OPTIONAL_FN(apr_status_t,modperl_interp_unselect,(void *));
APR_DECLARE_OPTIONAL_FN(modperl_interp_t
*,modperl_thx_interp_get,(PerlInterpreter *));
+#endif
/*
* perl context overriding and restoration is required when
Index: xs/APR/Pool/APR__Pool.h
===================================================================
--- xs/APR/Pool/APR__Pool.h (revision 627863)
+++ xs/APR/Pool/APR__Pool.h (working copy)
@@ -40,10 +40,11 @@
#ifndef MP_SOURCE_SCAN
#include "apr_optional.h"
-static
+#ifdef USE_ITHREADS
APR_OPTIONAL_FN_TYPE(modperl_interp_unselect) *modperl_opt_interp_unselect;
APR_OPTIONAL_FN_TYPE(modperl_thx_interp_get) *modperl_opt_thx_interp_get;
#endif
+#endif
#define MP_APR_POOL_SV_HAS_OWNERSHIP(sv) mpxs_pool_is_custom(sv)
Index: lib/ModPerl/WrapXS.pm
===================================================================
--- lib/ModPerl/WrapXS.pm (revision 627863)
+++ lib/ModPerl/WrapXS.pm (working copy)
@@ -595,7 +595,7 @@
}
}
- if ($module eq 'APR::Pool') {
+ if ($module eq 'APR::Pool' && Apache2::Build::PERL_HAS_ITHREADS) {
print $fh " modperl_opt_interp_unselect =
APR_RETRIEVE_OPTIONAL_FN(modperl_interp_unselect);\n\n";
print $fh " modperl_opt_thx_interp_get =
APR_RETRIEVE_OPTIONAL_FN(modperl_thx_interp_get);\n\n";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
