X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.h;h=6a8afdc13bc6e11e87b76c4663f5dcbda357f00b;hb=d7d93a8159c0ca10065c583e76157a51736a62cd;hp=b2cd7d6f59a054a77fb13fff16e52de1b0d2f08e;hpb=85e6fe838fb25b257a1b363debf8691c0992ef71;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/mg.h b/mg.h
index b2cd7d6..6a8afdc 100644
--- a/mg.h
+++ b/mg.h
@@ -1,20 +1,23 @@
-/* $RCSfile: arg.h,v $$Revision: 4.1 $$Date: 92/08/07 17:18:16 $
+/*    mg.h
  *
- *    Copyright (c) 1993, Larry Wall
+ *    Copyright (c) 1991-1999, 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.
  *
- * $Log:	arg.h,v $
  */
 
+#ifdef STRUCT_MGVTBL_DEFINITION
+STRUCT_MGVTBL_DEFINITION;
+#else
 struct mgvtbl {
-    int		(*svt_get)	P((SV *sv, MAGIC* mg));
-    int		(*svt_set)	P((SV *sv, MAGIC* mg));
-    U32		(*svt_len)	P((SV *sv, MAGIC* mg));
-    int		(*svt_clear)	P((SV *sv, MAGIC* mg));
-    int		(*svt_free)	P((SV *sv, MAGIC* mg));
+    int		(CPERLscope(*svt_get))	(pTHX_ SV *sv, MAGIC* mg);
+    int		(CPERLscope(*svt_set))	(pTHX_ SV *sv, MAGIC* mg);
+    U32		(CPERLscope(*svt_len))	(pTHX_ SV *sv, MAGIC* mg);
+    int		(CPERLscope(*svt_clear))(pTHX_ SV *sv, MAGIC* mg);
+    int		(CPERLscope(*svt_free))	(pTHX_ SV *sv, MAGIC* mg);
 };
+#endif
 
 struct magic {
     MAGIC*	mg_moremagic;
@@ -29,5 +32,19 @@ struct magic {
 
 #define MGf_TAINTEDDIR 1
 #define MGf_REFCOUNTED 2
-#define MgTAINTEDDIR(mg) (mg->mg_flags & MGf_TAINTEDDIR)
-#define MgTAINTEDDIR_on(mg) (mg->mg_flags |= MGf_TAINTEDDIR)
+#define MGf_GSKIP      4
+
+#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)))