svn commit: r628251 - in /perl/modperl/trunk: lib/ModPerl/WrapXS.pm src/modules/perl/mod_perl.h xs/APR/Pool/APR__Pool.h

[gozer]

Author: gozer
Date: Sat Feb 16 00:04:46 2008
New Revision: 628251

URL: http://svn.apache.org/viewvc?rev=628251&view=rev
Log:
Sprinkle a few missing #ifdefs introduced by the recently introduced
Perl 5.10 changes when building without ithreads.

Reviewed-By: gozer
Submitted-By: Randy Kobes <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]


Modified:
    perl/modperl/trunk/lib/ModPerl/WrapXS.pm
    perl/modperl/trunk/src/modules/perl/mod_perl.h
    perl/modperl/trunk/xs/APR/Pool/APR__Pool.h

Modified: perl/modperl/trunk/lib/ModPerl/WrapXS.pm
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/WrapXS.pm?rev=628251&r1=628250&r2=628251&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/WrapXS.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/WrapXS.pm Sat Feb 16 00:04:46 2008
@@ -595,7 +595,7 @@
         }
     }
 
-    if ($module eq 'APR::Pool') {
+    if ($module eq 'APR::Pool' &amp;&amp; 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";
     }

Modified: perl/modperl/trunk/src/modules/perl/mod_perl.h
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/mod_perl.h?rev=628251&r1=628250&r2=628251&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/mod_perl.h (original)
+++ perl/modperl/trunk/src/modules/perl/mod_perl.h Sat Feb 16 00:04:46 2008
@@ -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

Modified: perl/modperl/trunk/xs/APR/Pool/APR__Pool.h
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Pool/APR__Pool.h?rev=628251&r1=628250&r2=628251&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Pool/APR__Pool.h (original)
+++ perl/modperl/trunk/xs/APR/Pool/APR__Pool.h Sat Feb 16 00:04:46 2008
@@ -39,9 +39,11 @@
  */
 
 #ifndef MP_SOURCE_SCAN
+#ifdef USE_ITHREADS
 #include "apr_optional.h"
 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)