remove OVERLOAD conditionals

[perl5.git] / mg.h

diff --git a/mg.h b/mg.h
index a7d217c..702699f 100644 (file)
--- a/mg.h
+++ b/mg.h
@@ -1,19 +1,23 @@
 /*    mg.h
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
  */
 
+#ifdef STRUCT_MGVTBL_DEFINITION
+STRUCT_MGVTBL_DEFINITION;
+#else
 struct mgvtbl {
-    int                (*svt_get)      _((SV *sv, MAGIC* mg));
-    int                (*svt_set)      _((SV *sv, MAGIC* mg));
-    U32                (*svt_len)      _((SV *sv, MAGIC* mg));
-    int                (*svt_clear)    _((SV *sv, MAGIC* mg));
-    int                (*svt_free)     _((SV *sv, MAGIC* mg));
+    int                (CPERLscope(*svt_get))  _((SV *sv, MAGIC* mg));
+    int                (CPERLscope(*svt_set))  _((SV *sv, MAGIC* mg));
+    U32                (CPERLscope(*svt_len))  _((SV *sv, MAGIC* mg));
+    int                (CPERLscope(*svt_clear))        _((SV *sv, MAGIC* mg));
+    int                (CPERLscope(*svt_free)) _((SV *sv, MAGIC* mg));
 };
+#endif
 
 struct magic {
     MAGIC*     mg_moremagic;
@@ -29,5 +33,18 @@ struct magic {
 #define MGf_TAINTEDDIR 1
 #define MGf_REFCOUNTED 2
 #define MGf_GSKIP      4
-#define MgTAINTEDDIR(mg) (mg->mg_flags & MGf_TAINTEDDIR)
-#define MgTAINTEDDIR_on(mg) (mg->mg_flags |= MGf_TAINTEDDIR)
+
+#define MGf_MINMATCH   1
+
+#define MgTAINTEDDIR(mg)       (mg->mg_flags & MGf_TAINTEDDIR)
+#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_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)))