Update os2's OS2::Process

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

diff --git a/op.h b/op.h
index 8476acd..9015028 100644 (file)
--- a/op.h
+++ b/op.h
@@ -32,15 +32,19 @@ typedef U32 PADOFFSET;
 #define OPCODE U16
 #endif
 
+#ifdef BASEOP_DEFINITION
+#define BASEOP BASEOP_DEFINITION
+#else
 #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;                 \
     U8         op_flags;               \
     U8         op_private;
+#endif
 
 #define OP_GIMME(op,dfl) \
        (((op)->op_flags & OPf_WANT) == OPf_WANT_VOID   ? G_VOID   : \
@@ -185,11 +189,12 @@ struct pmop {
 };
 
 #define PMdf_USED      0x01            /* pm has been used once already */
+#define PMdf_TAINTED   0x02            /* pm compiled from tainted pattern */
 
-#define PMf_TAINTMEM   0x0001          /* taint $1 etc. if target tainted */
+#define PMf_RETAINT    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 */
+#define PMf_MAYBE_CONST        0x0008          /* replacement contains variables */
 #define PMf_SKIPWHITE  0x0010          /* skip leading whitespace for split */
 #define PMf_FOLD       0x0020          /* case insensitivity */
 #define PMf_CONST      0x0040          /* subst replacement is constant */