perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1457512 - in /perl/modperl/trunk: Makefile.PL src/modules/perl/modperl_perl.h
Date Sun, 17 Mar 2013 18:48:51 GMT
Author: stevehay
Date: Sun Mar 17 18:48:50 2013
New Revision: 1457512

URL: http://svn.apache.org/r1457512
Log:
Restore build with Perl 5.8.x (although 5.8.0 still has other problems for me).
- Recent perls set $Config{usethreads} to 'define' when built with ithreads, but older perls
did not (-Dusethreads was different to -Duseithreads), causing a perl version check failure
when wrongly testing $Config{usethreads} instead of the intended $Config{useithreads}.
- Newx and Newxz were added in 5.9.3.

Modified:
    perl/modperl/trunk/Makefile.PL
    perl/modperl/trunk/src/modules/perl/modperl_perl.h

Modified: perl/modperl/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Makefile.PL?rev=1457512&r1=1457511&r2=1457512&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Sun Mar 17 18:48:50 2013
@@ -511,7 +511,7 @@ sub perl_version_check {
         my @fail;
         push @fail, "Perl 5.8 or higher"
             unless $] >= 5.008;
-        push @fail, "Perl built with ithreads (build perl with -Dusethreads)"
+        push @fail, "Perl built with ithreads (build perl with -Duseithreads)"
             unless Apache2::Build::PERL_HAS_ITHREADS();
         if (@fail) {
             error "$perl_string and '$mpm' mpm httpd.",
@@ -545,7 +545,7 @@ sub perl_version_check {
         exit 1;
     }
 
-    if ($Config{usemultiplicity} xor $Config{usethreads}) {
+    if ($Config{usemultiplicity} xor $Config{useithreads}) {
         error "mod_perl does not currently support multiplicity without ".
 	      "ithreads.";
         if ($build->mpm_is_threaded()) {

Modified: perl/modperl/trunk/src/modules/perl/modperl_perl.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_perl.h?rev=1457512&r1=1457511&r2=1457512&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_perl.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_perl.h Sun Mar 17 18:48:50 2013
@@ -54,4 +54,11 @@ void modperl_hash_seed_set(pTHX);
 #    define GvGP_set(gv, gp) (GvGP(gv)=(gp))
 #endif
 
+#ifndef Newx
+#    define Newx(v,n,t) New(0,v,n,t)
+#endif
+#ifndef Newxz
+#    define Newxz(v,n,t) Newz(0,v,n,t)
+#endif
+
 #endif /* MODPERL_PERL_H */



Mime
View raw message