Upstream pkgsrc patch to support NetBSD 6.*

[perl5.git] / op.h

diff --git a/op.h b/op.h
index d61198f..09bf394 100644 (file)
--- a/op.h
+++ b/op.h
@@ -131,7 +131,8 @@ Deprecated.  Use C<GIMME_V> instead.
                                /*  On OP_DBSTATE, indicates breakpoint
                                 *    (runtime property) */
                                /*  On OP_REQUIRE, was seen as CORE::require */
-                               /*  On OP_ENTERWHEN, there's no condition */
+                               /*  On OP_(ENTER|LEAVE)WHEN, there's
+                                   no condition */
                                /*  On OP_SMARTMATCH, an implicit smartmatch */
                                /*  On OP_ANONHASH and OP_ANONLIST, create a
                                    reference to the new anon hash or array */
@@ -224,7 +225,7 @@ Deprecated.  Use C<GIMME_V> instead.
 #define OPpEARLY_CV            32      /* foo() called before sub foo was parsed */
   /* OP_?ELEM only */
 #define OPpLVAL_DEFER          16      /* Defer creation of array/hash elem */
-  /* OP_RV2?V, OP_GVSV, OP_ENTERITER only */
+  /* OP_RV2[SAH]V, OP_GVSV, OP_ENTERITER only */
 #define OPpOUR_INTRO           16      /* Variable was in an our() */
   /* OP_RV2[AGH]V, OP_PAD[AH]V, OP_[AH]ELEM, OP_[AH]SLICE OP_AV2ARYLEN,
      OP_R?KEYS, OP_SUBSTR, OP_POS, OP_VEC */
@@ -241,6 +242,7 @@ Deprecated.  Use C<GIMME_V> instead.
 #define OPpDONT_INIT_GV                4       /* Call gv_fetchpv with GV_NOINIT */
 /* (Therefore will return whatever is currently in the symbol table, not
    guaranteed to be a PVGV)  */
+#define OPpALLOW_FAKE          16      /* OK to return fake glob */
 
 /* Private for OP_ENTERITER and OP_ITER */
 #define OPpITER_REVERSED       4       /* for (reverse ...) */
@@ -293,6 +295,7 @@ Deprecated.  Use C<GIMME_V> instead.
 #define OPpFT_ACCESS           2       /* use filetest 'access' */
 #define OPpFT_STACKED          4       /* stacked filetest, as "-f" in "-f -x $f" */
 #define OPpFT_STACKING         8       /* stacking filetest, as "-x" in "-f -x $f" */
+#define OPpFT_AFTER_t          16      /* previous op was -t */
 
 /* Private for OP_(MAP|GREP)(WHILE|START) */
 #define OPpGREP_LEX            2       /* iterate over lexical $_ */
@@ -307,12 +310,16 @@ Deprecated.  Use C<GIMME_V> instead.
 #define OPpOFFBYONE            128     /* Treat caller(1) as caller(2) */
 
 /* Private for OP_COREARGS */
-/* These must not conflict with OPpDONT_INIT_GV.  See pp.c:S_rv2gv. */
+/* These must not conflict with OPpDONT_INIT_GV or OPpALLOW_FAKE.
+   See pp.c:S_rv2gv. */
 #define OPpCOREARGS_DEREF1     1       /* Arg 1 is a handle constructor */
 #define OPpCOREARGS_DEREF2     2       /* Arg 2 is a handle constructor */
 #define OPpCOREARGS_SCALARMOD  64      /* \$ rather than \[$@%*] */
 #define OPpCOREARGS_PUSHMARK   128     /* Call pp_pushmark */
 
+/* Private for OP_(LAST|REDO|NEXT|GOTO|DUMP) */
+#define OPpPV_IS_UTF8          128     /* label is in UTF8 */
+
 struct op {
     BASEOP
 };
@@ -996,6 +1003,22 @@ struct token {
  */
 
 /*
+=head1 Hook manipulation
+*/
+
+#ifdef USE_ITHREADS
+#  define OP_CHECK_MUTEX_INIT          MUTEX_INIT(&PL_check_mutex)
+#  define OP_CHECK_MUTEX_LOCK          MUTEX_LOCK(&PL_check_mutex)
+#  define OP_CHECK_MUTEX_UNLOCK                MUTEX_UNLOCK(&PL_check_mutex)
+#  define OP_CHECK_MUTEX_TERM          MUTEX_DESTROY(&PL_check_mutex)
+#else
+#  define OP_CHECK_MUTEX_INIT          NOOP
+#  define OP_CHECK_MUTEX_LOCK          NOOP
+#  define OP_CHECK_MUTEX_UNLOCK                NOOP
+#  define OP_CHECK_MUTEX_TERM          NOOP
+#endif
+
+/*
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4