[asperl] more changes to satisfy non-debug VC build (C-API doesn't

[p5sagit/p5-mst-13.2.git] / pp.h

diff --git a/pp.h b/pp.h
index 3df8663..de405f6 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -14,15 +14,11 @@
 #define ARGS
 #define dARGS
 #endif /* USE_THREADS */
-#ifdef CAN_PROTOTYPE
 #ifdef PERL_OBJECT
-#define PP(s) OP* CPerlObj::s _((ARGSproto))
+#define PP(s) OP * CPerlObj::s(ARGSproto)
 #else
 #define PP(s) OP * s(ARGSproto)
 #endif
-#else /* CAN_PROTOTYPE */
-#define PP(s) OP* s(ARGS) dARGS
-#endif /* CAN_PROTOTYPE */
 
 #define SP sp
 #define MARK mark
@@ -158,11 +154,14 @@
 #define ARGTARG                op->op_targ
 #define MAXARG         op->op_private
 
-#define SWITCHSTACK(f,t)       AvFILLp(f) = sp - stack_base;           \
-                               stack_base = AvARRAY(t);                \
-                               stack_max = stack_base + AvMAX(t);      \
-                               sp = stack_sp = stack_base + AvFILLp(t);        \
-                               curstack = t;
+#define SWITCHSTACK(f,t) \
+    STMT_START {                                                       \
+       AvFILLp(f) = sp - stack_base;                                   \
+       stack_base = AvARRAY(t);                                        \
+       stack_max = stack_base + AvMAX(t);                              \
+       sp = stack_sp = stack_base + AvFILLp(t);                        \
+       curstack = t;                                                   \
+    } STMT_END
 
 #define EXTEND_MORTAL(n) \
        STMT_START { \