X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.h;h=ccd3acc10b74dc33bb2b350edce13102c001e1c6;hb=ca63f0d242a6920af7209f1a190c17b7800ce145;hp=c4647465572a5e89df54ea779c3bd1df6517ca76;hpb=609794497049cf42bdd2396c04cbb7728e10374d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/mg.h b/mg.h
index c464746..ccd3acc 100644
--- a/mg.h
+++ b/mg.h
@@ -1,19 +1,23 @@
 /*    mg.h
  *
- *    Copyright (c) 1991-1997, 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.
  *
  */
 
+#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;
@@ -39,3 +43,8 @@ struct magic {
 #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)))