X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.h;h=004880344089d20c1ce1a4ebea08a594b52b3a21;hb=917b24923c0362e8f2d8d1f3f612150902a8f3eb;hp=702699fa71beecae53ac75485891d6a96890ced9;hpb=33c2748902d07b7ec367f87ad66e61e89f2aa994;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/mg.h b/mg.h
index 702699f..0048803 100644
--- a/mg.h
+++ b/mg.h
@@ -1,6 +1,6 @@
 /*    mg.h
  *
- *    Copyright (c) 1991-1997, Larry Wall
+ *    Copyright (c) 1991-2001, 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,7 +40,7 @@ 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)