In S_set_caret_X(), use GvSV() consistently in all conditional code.

[perl5.git] / perl.c

diff --git a/perl.c b/perl.c
index 5f85fd7..39c555c 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -13,7 +13,7 @@
 /*
  *      A ship then new they built for him
  *      of mithril and of elven-glass
- *              --from Bilbo's song of Eärendil
+ *              --from Bilbo's song of Eärendil
  *
  *     [p.236 of _The Lord of the Rings_, II/i: "Many Meetings"]
  */
@@ -1160,7 +1160,7 @@ perl_destruct(pTHXx)
        for (sva = PL_sv_arenaroot; sva; sva = MUTABLE_SV(SvANY(sva))) {
            svend = &sva[SvREFCNT(sva)];
            for (sv = sva + 1; sv < svend; ++sv) {
-               if (SvTYPE(sv) != SVTYPEMASK) {
+               if (SvTYPE(sv) != (svtype)SVTYPEMASK) {
                    PerlIO_printf(Perl_debug_log, "leaked: sv=0x%p"
                        " flags=0x%"UVxf
                        " refcnt=%"UVuf pTHX__FORMAT "\n"
@@ -1429,13 +1429,14 @@ S_set_caret_X(pTHX) {
     dVAR;
     GV* tmpgv = gv_fetchpvs("\030", GV_ADD|GV_NOTQUAL, SVt_PV); /* $^X */
     if (tmpgv) {
+       SV *const caret_x = GvSV(tmpgv);
 #ifdef HAS_PROCSELFEXE
-       S_procself_val(aTHX_ GvSV(tmpgv), PL_origargv[0]);
+       S_procself_val(aTHX_ caret_x, PL_origargv[0]);
 #else
 #ifdef OS2
-       sv_setpv(GvSVn(tmpgv), os2_execname(aTHX));
+       sv_setpv(caret_x, os2_execname(aTHX));
 #else
-       sv_setpv(GvSVn(tmpgv),PL_origargv[0]);
+       sv_setpv(caret_x, PL_origargv[0]);
 #endif
 #endif
     }
@@ -1659,6 +1660,9 @@ S_Internals_V(pTHX_ CV *cv)
 #  ifdef DEBUGGING
                             " DEBUGGING"
 #  endif
+#  ifdef HOMEGROWN_POSIX_SIGNALS
+                            " HOMEGROWN_POSIX_SIGNALS"
+#  endif
 #  ifdef NO_MATHOMS
                             " NO_MATHOMS"
 #  endif