[win32] add archname to *sitearch in config.{b,g,v}c

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

diff --git a/pp_hot.c b/pp_hot.c
index d05f578..7c320b3 100644 (file)
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -295,9 +295,9 @@ PP(pp_print)
        gv = (GV*)*++MARK;
     else
        gv = defoutgv;
-    if (SvMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) {
+    if (SvRMAGICAL(gv) && (mg = mg_find((SV*)gv, 'q'))) {
        if (MARK == ORIGMARK) {
-           EXTEND(SP, 1);
+           MEXTEND(SP, 1);
            ++MARK;
            Move(MARK, MARK + 1, (SP - MARK) + 1, SV*);
            ++SP;
@@ -759,7 +759,7 @@ PP(pp_match)
     if (op->op_flags & OPf_STACKED)
        TARG = POPs;
     else {
-       TARG = GvSV(defgv);
+       TARG = DEFSV;
        EXTEND(SP,1);
     }
     PUTBACK;                           /* EVAL blocks need stack_sp. */
@@ -983,7 +983,7 @@ do_readline(void)
     I32 gimme = GIMME_V;
     MAGIC *mg;
 
-    if (SvMAGICAL(last_in_gv) && (mg = mg_find((SV*)last_in_gv, 'q'))) {
+    if (SvRMAGICAL(last_in_gv) && (mg = mg_find((SV*)last_in_gv, 'q'))) {
        PUSHMARK(SP);
        XPUSHs(mg->mg_obj);
        PUTBACK;
@@ -1106,9 +1106,14 @@ do_readline(void)
                sv_catsv(tmpcmd, tmpglob);
                sv_catpv(tmpcmd, "; do echo \"$a\\0\\c\"; done |");
 #else
+#ifdef DJGPP
+               sv_setpv(tmpcmd, "/dev/dosglob/"); /* File System Extension */
+               sv_catsv(tmpcmd, tmpglob);
+#else
                sv_setpv(tmpcmd, "perlglob ");
                sv_catsv(tmpcmd, tmpglob);
                sv_catpv(tmpcmd, " |");
+#endif /* !DJGPP */
 #endif /* !OS2 */
 #else /* !DOSISH */
 #if defined(CSH)
@@ -1432,7 +1437,7 @@ PP(pp_subst)
     if (op->op_flags & OPf_STACKED)
        TARG = POPs;
     else {
-       TARG = GvSV(defgv);
+       TARG = DEFSV;
        EXTEND(SP,1);
     }
     if (SvREADONLY(TARG)
@@ -1705,7 +1710,7 @@ PP(pp_grepwhile)
 
        src = stack_base[*markstack_ptr];
        SvTEMP_off(src);
-       GvSV(defgv) = src;
+       DEFSV = src;
 
        RETURNOP(cLOGOP->op_other);
     }
@@ -1840,7 +1845,7 @@ PP(pp_entersub)
 
     if (!CvROOT(cv) && !CvXSUB(cv)) {
        GV* autogv;
-       SV* subname;
+       SV* sub_name;
 
        /* anonymous or undef'd function leaves us no recourse */
        if (CvANON(cv) || !(gv = CvGV(cv)))
@@ -1858,9 +1863,9 @@ PP(pp_entersub)
            goto retry;
        }
        /* sorry */
-       subname = sv_newmortal();
-       gv_efullname3(subname, gv, Nullch);
-       DIE("Undefined subroutine &%s called", SvPVX(subname));
+       sub_name = sv_newmortal();
+       gv_efullname3(sub_name, gv, Nullch);
+       DIE("Undefined subroutine &%s called", SvPVX(sub_name));
     }
 
     gimme = GIMME_V;
@@ -2343,3 +2348,4 @@ PP(pp_method)
     SETs(isGV(gv) ? (SV*)GvCV(gv) : (SV*)gv);
     RETURN;
 }
+