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

diff --git a/mg.h b/mg.h
index 82c8855..05ad08b 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, by Larry Wall and others
+ *    2000, 2002, 2005, 2006, 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.
@@ -26,13 +26,13 @@ struct mgvtbl {
 
 struct magic {
     MAGIC*	mg_moremagic;
-    const MGVTBL* mg_virtual;	/* pointer to magic functions */
+    MGVTBL*	mg_virtual;	/* pointer to magic functions */
     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 */
@@ -57,7 +57,6 @@ struct magic {
 				 SvPV_nolen_const((SV*)((mg)->mg_ptr)) :  \
 				 (const char*)(mg)->mg_ptr)
 
-#define SvTIED_mg(sv,how) \
-    (SvRMAGICAL(sv) ? mg_find((sv),(how)) : Null(MAGIC*))
+#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)))