The THINKFIRST check after the GMAGICAL check in sv_2iv_flags and

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

diff --git a/mg.h b/mg.h
index f07c248..8f5644b 100644 (file)
--- a/mg.h
+++ b/mg.h
@@ -48,8 +48,11 @@ struct magic {
 #define MgPV(mg,lp)            ((((int)(lp = (mg)->mg_len)) == HEf_SVKEY) ?   \
                                 SvPV((SV*)((mg)->mg_ptr),lp) :         \
                                 (mg)->mg_ptr)
-#define MgPV_const(mg,lp)      ((((int)(lp = (mg)->mg_len)) == HEf_SVKEY) ?   \
-                                SvPV_const((SV*)((mg)->mg_ptr),lp) :   \
+#define MgPV_const(mg,lp)      ((((int)(lp = (mg)->mg_len)) == HEf_SVKEY) ? \
+                                SvPV_const((SV*)((mg)->mg_ptr),lp) :        \
+                                (const char*)(mg)->mg_ptr)
+#define MgPV_nolen_const(mg)   (((((int)(mg)->mg_len)) == HEf_SVKEY) ?   \
+                                SvPV_nolen_const((SV*)((mg)->mg_ptr)) :  \
                                 (const char*)(mg)->mg_ptr)
 
 #define SvTIED_mg(sv,how) \