Tidy up Windows makefiles' handling of CCTYPE=SDK2003SP1

[perl5.git] / op.h

diff --git a/op.h b/op.h
index 5ba7167..bfdebaa 100644 (file)
--- a/op.h
+++ b/op.h
@@ -522,7 +522,7 @@ typedef enum {
 #  define      cMETHOPx_rclass(v) (cMETHOPx(v)->op_rclass_sv)
 #endif
 
-#  define      cMETHOPx_meth(v)        cSVOPx_sv(v)
+#define        cMETHOPx_meth(v)        cSVOPx_sv(v)
 
 #define        cGVOP_gv                cGVOPx_gv(PL_op)
 #define        cGVOPo_gv               cGVOPx_gv(o)
@@ -628,21 +628,13 @@ typedef enum {
 #endif
 
 
-/* basic and extended translation tables attached to OP_TRANS/OP_TRANSR ops */
+/* translation table attached to OP_TRANS/OP_TRANSR ops */
 
 typedef struct {
-    short map[256];
+    Size_t size; /* number of entries in map[], not including final slot */
+    short map[1]; /* Unwarranted chumminess */
 } OPtrans_map;
 
-/* used in the presence of tr///c to record any replacement chars that
- * are paired with the implicit 0x100..0x7fffffff search chars */
-typedef struct {
-    short map[256];
-    SSize_t excess_len; /* number of entries in map_ex[] */
-    short repeat_char;
-    short map_ex[1];  /* Unwarranted chumminess */
-} OPtrans_map_ex;
-
 
 /*
 =head1 Optree Manipulation Functions
@@ -1117,9 +1109,13 @@ C<sib> is non-null. For a higher-level interface, see C<L</op_sibling_splice>>.
 #define MDEREF_SHIFT           7
 
 #if defined(PERL_IN_DOOP_C) || defined(PERL_IN_PP_C)
-static const char * const fatal_above_ff_msg
-    = "Use of strings with code points over 0xFF as arguments to "
-      "%s operator is not allowed";
+#   define FATAL_ABOVE_FF_MSG                                       \
+      "Use of strings with code points over 0xFF as arguments to "  \
+      "%s operator is not allowed"
+#  define DEPRECATED_ABOVE_FF_MSG                                   \
+      "Use of strings with code points over 0xFF as arguments to "  \
+      "%s operator is deprecated. This will be a fatal error in "   \
+      "Perl 5.32"
 #endif