The previous change causes compile failures with threaded Perls.

[perl5.git] / mg.h

diff --git a/mg.h b/mg.h
index 82c8855..2e12374 100644 (file)
--- 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,7 +26,7 @@ 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;
@@ -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)))