Handle the rare but legal angle bracket in unixify.

[p5sagit/p5-mst-13.2.git] / vms / vmsish.h

diff --git a/vms/vmsish.h b/vms/vmsish.h
index 3c5b823..95ac23b 100644 (file)
--- a/vms/vmsish.h
+++ b/vms/vmsish.h
@@ -363,9 +363,9 @@
 #define NATIVE_HINTS           (PL_hints >> HINT_V_VMSISH)  /* used in op.c */
 
 #ifdef PERL_IMPLICIT_CONTEXT
-#  define TEST_VMSISH(h)       (my_perl && (PL_curcop->op_private & ((h) >> HINT_V_VMSISH)))
+#  define TEST_VMSISH(h)       (my_perl && PL_curcop && (PL_curcop->op_private & ((h) >> HINT_V_VMSISH)))
 #else
-#  define TEST_VMSISH(h)       (PL_curcop->op_private & ((h) >> HINT_V_VMSISH))
+#  define TEST_VMSISH(h)       (PL_curcop && (PL_curcop->op_private & ((h) >> HINT_V_VMSISH)))
 #endif
 #define VMSISH_STATUS  TEST_VMSISH(HINT_M_VMSISH_STATUS)
 #define VMSISH_TIME    TEST_VMSISH(HINT_M_VMSISH_TIME)
@@ -418,7 +418,12 @@ struct interp_intern {
 #define HAS_KILL
 #define HAS_WAIT
 
-#define PERL_FS_VER_FMT                "%d_%d_%d"
+#ifndef PERL_CORE
+#  define PERL_FS_VER_FMT      "%d_%d_%d"
+#endif
+#define PERL_FS_VERSION                STRINGIFY(PERL_REVISION) "_" \
+                               STRINGIFY(PERL_VERSION) "_" \
+                               STRINGIFY(PERL_SUBVERSION)
 /* Temporary; we need to add support for this to Configure.Com */
 #ifdef PERL_INC_VERSION_LIST
 #  undef PERL_INC_VERSION_LIST