remove OVERLOAD conditionals

[perl5.git] / mg.h

diff --git a/mg.h b/mg.h
index 2610d1a..702699f 100644 (file)
--- a/mg.h
+++ b/mg.h
@@ -7,6 +7,9 @@
  *
  */
 
+#ifdef STRUCT_MGVTBL_DEFINITION
+STRUCT_MGVTBL_DEFINITION;
+#else
 struct mgvtbl {
     int                (CPERLscope(*svt_get))  _((SV *sv, MAGIC* mg));
     int                (CPERLscope(*svt_set))  _((SV *sv, MAGIC* mg));
@@ -14,6 +17,7 @@ struct mgvtbl {
     int                (CPERLscope(*svt_clear))        _((SV *sv, MAGIC* mg));
     int                (CPERLscope(*svt_free)) _((SV *sv, MAGIC* mg));
 };
+#endif
 
 struct magic {
     MAGIC*     mg_moremagic;
@@ -23,7 +27,7 @@ struct magic {
     U8         mg_flags;
     SV*                mg_obj;
     char*      mg_ptr;
-    I32                mg_length;
+    I32                mg_len;
 };
 
 #define MGf_TAINTEDDIR 1
@@ -36,6 +40,11 @@ struct magic {
 #define MgTAINTEDDIR_on(mg)    (mg->mg_flags |= MGf_TAINTEDDIR)
 #define MgTAINTEDDIR_off(mg)   (mg->mg_flags &= ~MGf_TAINTEDDIR)
 
-#define MgPV(mg,lp)            (((lp = (mg)->mg_length) == HEf_SVKEY) ?   \
+#define MgPV(mg,lp)            (((lp = (mg)->mg_len) == HEf_SVKEY) ?   \
                                 SvPV((SV*)((mg)->mg_ptr),lp) :         \
                                 (mg)->mg_ptr)
+
+#define SvTIED_mg(sv,how) \
+    (SvRMAGICAL(sv) ? mg_find((sv),(how)) : Null(MAGIC*))
+#define SvTIED_obj(sv,mg) \
+    ((mg)->mg_obj ? (mg)->mg_obj : sv_2mortal(newRV(sv)))