X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.h;h=ad50f5a0ae460e862f8b6e5dd734b7857e6fd4a8;hb=5095244257e3c5d9389813ccbcd2187ff6e2e91f;hp=16efdb5d7a296c7be4ac98b492c427fcbdad5355;hpb=0f4eea8fa1779e08575278392ed398ffeda6dcd2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/mg.h b/mg.h
index 16efdb5..ad50f5a 100644
--- a/mg.h
+++ b/mg.h
@@ -1,6 +1,6 @@
 /*    mg.h
  *
- *    Copyright (c) 1991-1997, Larry Wall
+ *    Copyright (c) 1991-2000, 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.
@@ -11,11 +11,11 @@
 STRUCT_MGVTBL_DEFINITION;
 #else
 struct mgvtbl {
-    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));
+    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
 
@@ -40,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_len) == HEf_SVKEY) ?   \
+#define MgPV(mg,lp)		((((int)(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)))