erroneous 'none' in lddlflags

[perl5.git] / run.c

diff --git a/run.c b/run.c
index 9753a66..3c1c3a2 100644 (file)
--- a/run.c
+++ b/run.c
@@ -17,9 +17,9 @@
  */
 
 #ifdef PERL_OBJECT
-#define CALLOP this->*op
+#define CALLOP this->*PL_op
 #else
-#define CALLOP *op
+#define CALLOP *PL_op
 #endif
 
 int
@@ -27,17 +27,13 @@ runops_standard(void)
 {
     dTHR;
 
-    while ( op = (CALLOP->op_ppaddr)(ARGS) ) ;
+    while ( PL_op = (CALLOP->op_ppaddr)(ARGS) ) ;
 
     TAINT_NOT;
     return 0;
 }
 
 #ifdef DEBUGGING
-
-dEXT char **watchaddr = 0;
-dEXT char *watchok;
-
 #ifndef PERL_OBJECT
 static void debprof _((OP*o));
 #endif
@@ -49,21 +45,21 @@ runops_debug(void)
 {
 #ifdef DEBUGGING
     dTHR;
-    if (!op) {
+    if (!PL_op) {
        warn("NULL OP IN RUN");
        return 0;
     }
 
     do {
        if (PL_debug) {
-           if (watchaddr != 0 && *watchaddr != watchok)
+           if (PL_watchaddr != 0 && *PL_watchaddr != PL_watchok)
                PerlIO_printf(Perl_debug_log, "WARNING: %lx changed from %lx to %lx\n",
-                   (long)watchaddr, (long)watchok, (long)*watchaddr);
+                   (long)PL_watchaddr, (long)PL_watchok, (long)*PL_watchaddr);
            DEBUG_s(debstack());
-           DEBUG_t(debop(op));
-           DEBUG_P(debprof(op));
+           DEBUG_t(debop(PL_op));
+           DEBUG_P(debprof(PL_op));
        }
-    } while ( op = (CALLOP->op_ppaddr)(ARGS) );
+    } while ( PL_op = (CALLOP->op_ppaddr)(ARGS) );
 
     TAINT_NOT;
     return 0;
@@ -77,7 +73,8 @@ debop(OP *o)
 {
 #ifdef DEBUGGING
     SV *sv;
-    deb("%s", op_name[o->op_type]);
+    STRLEN n_a;
+    deb("%s", PL_op_name[o->op_type]);
     switch (o->op_type) {
     case OP_CONST:
        PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo->op_sv));
@@ -87,7 +84,7 @@ debop(OP *o)
        if (cGVOPo->op_gv) {
            sv = NEWSV(0,0);
            gv_fullname3(sv, cGVOPo->op_gv, Nullch);
-           PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, PL_na));
+           PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, n_a));
            SvREFCNT_dec(sv);
        }
        else
@@ -105,10 +102,11 @@ void
 watch(char **addr)
 {
 #ifdef DEBUGGING
-    watchaddr = addr;
-    watchok = *addr;
+    dTHR;
+    PL_watchaddr = addr;
+    PL_watchok = *addr;
     PerlIO_printf(Perl_debug_log, "WATCHING, %lx is currently %lx\n",
-       (long)watchaddr, (long)watchok);
+       (long)PL_watchaddr, (long)PL_watchok);
 #endif /* DEBUGGING */
 }
 
@@ -133,7 +131,7 @@ debprofdump(void)
        if (PL_profiledata[i])
            PerlIO_printf(Perl_debug_log,
                          "%5lu %s\n", (unsigned long)PL_profiledata[i],
-                                       op_name[i]);
+                                       PL_op_name[i]);
     }
 #endif /* DEBUGGING */
 }