X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.h;h=82c88552bf3bdf693d66a264910a500b2a87fe9a;hb=74ac850a5ee417afa60a477ea52af7a8f46a7e5a;hp=f07c248f2485f83d0cd0a88d52aac133cb633e03;hpb=fa28a6c6f7e8f9e40914ce7c0e4bd1cf2100f380;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/mg.h b/mg.h
index f07c248..82c8855 100644
--- a/mg.h
+++ b/mg.h
@@ -20,6 +20,7 @@ struct mgvtbl {
     int		(CPERLscope(*svt_copy))	(pTHX_ SV *sv, MAGIC* mg,
     					SV *nsv, const char *name, int namlen);
     int		(CPERLscope(*svt_dup))	(pTHX_ MAGIC *mg, CLONE_PARAMS *param);
+    int		(CPERLscope(*svt_local))(pTHX_ SV *nsv, MAGIC *mg);
 };
 #endif
 
@@ -38,8 +39,9 @@ struct magic {
 #define MGf_MINMATCH   1        /* PERL_MAGIC_regex_global only */
 #define MGf_REFCOUNTED 2
 #define MGf_GSKIP      4
-#define MGf_COPY       8
-#define MGf_DUP        16
+#define MGf_COPY       8	/* has an svt_copy  MGVTBL entry */
+#define MGf_DUP     0x10 	/* has an svt_dup   MGVTBL entry */
+#define MGf_LOCAL   0x20	/* has an svt_local MGVTBL entry */
 
 #define MgTAINTEDDIR(mg)	(mg->mg_flags & MGf_TAINTEDDIR)
 #define MgTAINTEDDIR_on(mg)	(mg->mg_flags |= MGf_TAINTEDDIR)
@@ -48,8 +50,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) \