X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp.h;h=de405f6c8fc0838a91c06ea8c5a9468ee224a8ea;hb=249edfdff1b2b750e894ee5a0b6cb64d2640ca02;hp=ed99a89dfa8aee365860e2999282b4f2a119462f;hpb=76e3520e1f6b7df33cd381a2cf4f1fce3d69c8a4;p=p5sagit%2Fp5-mst-13.2.git diff --git a/pp.h b/pp.h index ed99a89..de405f6 100644 --- 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) AvFILL(f) = sp - stack_base; \ - stack_base = AvARRAY(t); \ - stack_max = stack_base + AvMAX(t); \ - sp = stack_sp = stack_base + AvFILL(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 { \