fix various 5.00552 mishaps (fixes suggested by Jan Dubois,

Kurt Starsinic, Spider Boardman, Dan Sugalski and Albert
Dvornik)

p4raw-id: //depot/perl@1899

diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 16033f9..c19dd05 100644 (file)
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -219,7 +219,7 @@ if [ "X$use64bits" = "X$define" ]; then
     uname_r=`uname -r`
     case "$uname_r" in
     [1-5]*|6.[01])
-       echo >&4 "IRIX $uname_r" does not support 64-bit types."
+       echo >&4 "IRIX $uname_r does not support 64-bit types."
        echo >&4 "You should upgrade to at least IRIX 6.2."
        exit 1
        ;;

diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 4b3fed7..ba40fd7 100644 (file)
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -2,7 +2,7 @@ BEGIN {require 5.002;} # MakeMaker 5.17 was the last MakeMaker that was compatib
 
 package ExtUtils::MakeMaker;
 
-$Version = $VERSION = "5.4301";
+$Version = $VERSION = "5.4302";
 $Version_OK = "5.17";  # Makefiles older than $Version_OK will die
                        # (Will be checked from MakeMaker version 4.13 onwards)
 ($Revision = substr(q$Revision: 1.222 $, 10)) =~ s/\s+$//;

diff --git a/mg.c b/mg.c
index e4ddcd6..1af7240 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -94,10 +94,13 @@ restore_magic(void *p)
      */
     if (PL_savestack_ix == mgs->mgs_ss_ix)
     {
-        assert(SSPOPINT == SAVEt_DESTRUCTOR);
+       I32 popval = SSPOPINT;
+        assert(popval == SAVEt_DESTRUCTOR);
         PL_savestack_ix -= 2;
-        assert(SSPOPINT == SAVEt_ALLOC);
-        PL_savestack_ix -= SSPOPINT;
+       popval = SSPOPINT;
+        assert(popval == SAVEt_ALLOC);
+       popval = SSPOPINT;
+        PL_savestack_ix -= popval;
     }
 
 }

diff --git a/scope.c b/scope.c
index 5ba56d2..b603641 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -144,9 +144,7 @@ free_tmps(void)
        SV* sv = PL_tmps_stack[PL_tmps_ix];
        PL_tmps_stack[PL_tmps_ix--] = Nullsv;
        if (sv) {
-#ifdef DEBUGGING
            SvTEMP_off(sv);
-#endif
            SvREFCNT_dec(sv);           /* note, can modify tmps_ix!!! */
        }
     }