X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=run.c;h=d7133c7ba771b06119a752f8caa0b3bdf017a5a7;hb=249edfdff1b2b750e894ee5a0b6cb64d2640ca02;hp=87633d18048c4cb2c24987f16d3e9584f3b757d2;hpb=7c06b590c066c6b354b0347a68bd9817268651b8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/run.c b/run.c
index 87633d1..d7133c7 100644
--- a/run.c
+++ b/run.c
@@ -16,24 +16,38 @@
  * know.  Run now!  Hope is in speed!"  --Gandalf
  */
 
-dEXT char **watchaddr = 0;
-dEXT char *watchok;
+#ifdef PERL_OBJECT
+#define CALLOP this->*op
+#else
+#define CALLOP *op
+#endif
 
 int
-runops_standard() {
+runops_standard(void)
+{
     dTHR;
 
-    while ( op = (*op->op_ppaddr)(ARGS) ) ;
+    while ( 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
+
+#endif	/* DEBUGGING */
 
 int
-runops_debug() {
+runops_debug(void)
+{
+#ifdef DEBUGGING
     dTHR;
     if (!op) {
 	warn("NULL OP IN RUN");
@@ -49,16 +63,19 @@ runops_debug() {
 	    DEBUG_t(debop(op));
 	    DEBUG_P(debprof(op));
 	}
-    } while ( op = (*op->op_ppaddr)(ARGS) );
+    } while ( op = (CALLOP->op_ppaddr)(ARGS) );
 
     TAINT_NOT;
     return 0;
+#else
+    return runops_standard();
+#endif	/* DEBUGGING */
 }
 
 I32
-debop(o)
-OP *o;
+debop(OP *o)
 {
+#ifdef DEBUGGING
     SV *sv;
     deb("%s", op_name[o->op_type]);
     switch (o->op_type) {
@@ -80,31 +97,35 @@ OP *o;
 	break;
     }
     PerlIO_printf(Perl_debug_log, "\n");
+#endif	/* DEBUGGING */
     return 0;
 }
 
 void
-watch(addr)
-char **addr;
+watch(char **addr)
 {
+#ifdef DEBUGGING
     watchaddr = addr;
     watchok = *addr;
     PerlIO_printf(Perl_debug_log, "WATCHING, %lx is currently %lx\n",
 	(long)watchaddr, (long)watchok);
+#endif	/* DEBUGGING */
 }
 
-static void
-debprof(o)
-OP* o;
+STATIC void
+debprof(OP *o)
 {
+#ifdef DEBUGGING
     if (!profiledata)
 	New(000, profiledata, MAXO, U32);
     ++profiledata[o->op_type];
+#endif /* DEBUGGING */
 }
 
 void
-debprofdump()
+debprofdump(void)
 {
+#ifdef DEBUGGING
     unsigned i;
     if (!profiledata)
 	return;
@@ -113,7 +134,5 @@ debprofdump()
 	    PerlIO_printf(Perl_debug_log,
 			  "%u\t%lu\n", i, (unsigned long)profiledata[i]);
     }
+#endif	/* DEBUGGING */
 }
-
-#endif
-