Nuke some more n_a, and convert S_gv_ename from char * to const char *

[p5sagit/p5-mst-13.2.git] / pad.c

diff --git a/pad.c b/pad.c
index c405813..e821069 100644 (file)
--- a/pad.c
+++ b/pad.c
@@ -1235,7 +1235,7 @@ Perl_pad_free(pTHX_ PADOFFSET po)
 #ifdef USE_ITHREADS
        /* SV could be a shared hash key (eg bugid #19022) */
        if (
-#ifdef PERL_COPY_ON_WRITE
+#ifdef PERL_OLD_COPY_ON_WRITE
            !SvIsCOW(PL_curpad[po])
 #else
            !SvFAKE(PL_curpad[po])
@@ -1524,8 +1524,8 @@ void
 Perl_pad_fixup_inner_anons(pTHX_ PADLIST *padlist, CV *old_cv, CV *new_cv)
 {
     I32 ix;
-    AV *comppad_name = (AV*)AvARRAY(padlist)[0];
-    AV *comppad = (AV*)AvARRAY(padlist)[1];
+    AV * const comppad_name = (AV*)AvARRAY(padlist)[0];
+    AV * const comppad = (AV*)AvARRAY(padlist)[1];
     SV **namepad = AvARRAY(comppad_name);
     SV **curpad = AvARRAY(comppad);
     for (ix = AvFILLp(comppad_name); ix > 0; ix--) {