Integrate from ansi branch to mainline.

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

diff --git a/run.c b/run.c
index 2f8d8fa..6afab88 100644 (file)
--- a/run.c
+++ b/run.c
@@ -19,13 +19,9 @@
 dEXT char **watchaddr = 0;
 dEXT char *watchok;
 
-#ifndef DEBUGGING
-
 int
-runops() {
+runops_standard(void) {
     dTHR;
-    SAVEI32(runlevel);
-    runlevel++;
 
     while ( op = (*op->op_ppaddr)(ARGS) ) ;
 
@@ -33,21 +29,17 @@ runops() {
     return 0;
 }
 
-#else
-
+#ifdef DEBUGGING
 static void debprof _((OP*o));
 
 int
-runops() {
+runops_debug(void) {
     dTHR;
     if (!op) {
        warn("NULL OP IN RUN");
        return 0;
     }
 
-    SAVEI32(runlevel);
-    runlevel++;
-
     do {
        if (debug) {
            if (watchaddr != 0 && *watchaddr != watchok)
@@ -64,8 +56,7 @@ runops() {
 }
 
 I32
-debop(o)
-OP *o;
+debop(OP *o)
 {
     SV *sv;
     deb("%s", op_name[o->op_type]);
@@ -92,8 +83,7 @@ OP *o;
 }
 
 void
-watch(addr)
-char **addr;
+watch(char **addr)
 {
     watchaddr = addr;
     watchok = *addr;
@@ -102,8 +92,7 @@ char **addr;
 }
 
 static void
-debprof(o)
-OP* o;
+debprof(OP *o)
 {
     if (!profiledata)
        New(000, profiledata, MAXO, U32);
@@ -111,7 +100,7 @@ OP* o;
 }
 
 void
-debprofdump()
+debprofdump(void)
 {
     unsigned i;
     if (!profiledata)