partly revert change#4851, apparently POSIX::uname() may not be correct

[perl5.git] / run.c

diff --git a/run.c b/run.c
index cd831cb..57f90de 100644 (file)
--- a/run.c
+++ b/run.c
@@ -1,6 +1,6 @@
 /*    run.c
  *
- *    Copyright (c) 1991-1999, Larry Wall
+ *    Copyright (c) 1991-2000, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -23,9 +23,7 @@ Perl_runops_standard(pTHX)
     dTHR;
 
     while ( PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX) ) {
-#ifdef MACOS_TRADITIONAL
-       MACPERL_DO_ASYNC_TASKS();
-#endif 
+       PERL_ASYNC_CHECK();
     }
 
     TAINT_NOT;
@@ -44,14 +42,13 @@ Perl_runops_debug(pTHX)
     }
 
     do {
-#ifdef MACOS_TRADITIONAL
-       MACPERL_DO_ASYNC_TASKS();
-#endif 
+       PERL_ASYNC_CHECK();
        if (PL_debug) {
            if (PL_watchaddr != 0 && *PL_watchaddr != PL_watchok)
                PerlIO_printf(Perl_debug_log,
                              "WARNING: %"UVxf" changed from %"UVxf" to %"UVxf"\n",
-                             PTR2UV(PL_watchaddr), PTR2UV(PL_watchok), (UV)*PL_watchaddr);
+                             PTR2UV(PL_watchaddr), PTR2UV(PL_watchok),
+                             PTR2UV(*PL_watchaddr));
            DEBUG_s(debstack());
            DEBUG_t(debop(PL_op));
            DEBUG_P(debprof(PL_op));
@@ -74,13 +71,13 @@ Perl_debop(pTHX_ OP *o)
     Perl_deb(aTHX_ "%s", PL_op_name[o->op_type]);
     switch (o->op_type) {
     case OP_CONST:
-       PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo->op_sv));
+       PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo_sv));
        break;
     case OP_GVSV:
     case OP_GV:
-       if (cSVOPo->op_sv) {
+       if (cGVOPo_gv) {
            sv = NEWSV(0,0);
-           gv_fullname3(sv, (GV*)cSVOPo->op_sv, Nullch);
+           gv_fullname3(sv, cGVOPo_gv, Nullch);
            PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, n_a));
            SvREFCNT_dec(sv);
        }