[asperl] fixups to make it build and pass tests under both compilers

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

diff --git a/op.h b/op.h
index a203c44..0cc6be7 100644 (file)
--- a/op.h
+++ b/op.h
@@ -35,7 +35,7 @@ typedef U32 PADOFFSET;
 #define BASEOP                         \
     OP*                op_next;                \
     OP*                op_sibling;             \
-    OP*                (*op_ppaddr)_((ARGSproto));             \
+    OP*                (CPERLscope(*op_ppaddr))_((ARGSproto));         \
     PADOFFSET  op_targ;                \
     OPCODE     op_type;                \
     U16                op_seq;                 \
@@ -181,9 +181,12 @@ struct pmop {
     REGEXP *   op_pmregexp;            /* compiled expression */
     U16                op_pmflags;
     U16                op_pmpermflags;
+    U8         op_pmdynflags;
 };
 
-#define PMf_USED       0x0001          /* pm has been used once already */
+#define PMdf_USED      0x01            /* pm has been used once already */
+
+#define PMf_TAINTMEM   0x0001          /* taint $1 etc. if target tainted */
 #define PMf_ONCE       0x0002          /* use pattern only once per reset */
 #define PMf_REVERSED   0x0004          /* Should be matched right->left */
 /*#define PMf_ALL              0x0008*/                /* initial constant is whole pat */