X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.h;h=fcac411113120ac30e9e9bcedafdfaeaf04fafd7;hb=a80e323fbf3c4c14f0fce8c693c9a91eb9d69497;hp=2e1237446b5009c4855b44dfd7668349afe1acaf;hpb=4608196e45589eea5792cff92b551109899ddb06;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/mg.h b/mg.h
index 2e12374..fcac411 100644
--- a/mg.h
+++ b/mg.h
@@ -1,7 +1,7 @@
 /*    mg.h
  *
  *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999,
- *    2000, 2002, 2005, 2006, by Larry Wall and others
+ *    2000, 2002, 2005, 2006, 2007, 2008 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -18,7 +18,7 @@ struct mgvtbl {
     int		(CPERLscope(*svt_clear))(pTHX_ SV *sv, MAGIC* mg);
     int		(CPERLscope(*svt_free))	(pTHX_ SV *sv, MAGIC* mg);
     int		(CPERLscope(*svt_copy))	(pTHX_ SV *sv, MAGIC* mg,
-    					SV *nsv, const char *name, int namlen);
+    					SV *nsv, const char *name, I32 namlen);
     int		(CPERLscope(*svt_dup))	(pTHX_ MAGIC *mg, CLONE_PARAMS *param);
     int		(CPERLscope(*svt_local))(pTHX_ SV *nsv, MAGIC *mg);
 };
@@ -30,9 +30,9 @@ struct magic {
     U16		mg_private;
     char	mg_type;
     U8		mg_flags;
+    I32		mg_len;
     SV*		mg_obj;
     char*	mg_ptr;
-    I32		mg_len;
 };
 
 #define MGf_TAINTEDDIR 1        /* PERL_MAGIC_envelem only */
@@ -48,15 +48,25 @@ struct magic {
 #define MgTAINTEDDIR_off(mg)	(mg->mg_flags &= ~MGf_TAINTEDDIR)
 
 #define MgPV(mg,lp)		((((int)(lp = (mg)->mg_len)) == HEf_SVKEY) ?   \
-				 SvPV((SV*)((mg)->mg_ptr),lp) :		\
+				 SvPV(MUTABLE_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) :        \
+				 SvPV_const(MUTABLE_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)) :  \
+#define MgPV_nolen_const(mg)	(((((int)(mg)->mg_len)) == HEf_SVKEY) ?	\
+				 SvPV_nolen_const(MUTABLE_SV((mg)->mg_ptr)) : \
 				 (const char*)(mg)->mg_ptr)
 
 #define SvTIED_mg(sv,how) (SvRMAGICAL(sv) ? mg_find((sv),(how)) : NULL)
 #define SvTIED_obj(sv,mg) \
     ((mg)->mg_obj ? (mg)->mg_obj : sv_2mortal(newRV(sv)))
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */