Where possible, change gv_fetchfile() to gv_fetchfile_flags(),

[perl5.git] / mg.h

diff --git a/mg.h b/mg.h
index 3e90732..05ad08b 100644 (file)
--- a/mg.h
+++ b/mg.h
@@ -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)))