X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=mg.h;h=fcac411113120ac30e9e9bcedafdfaeaf04fafd7;hb=3bc3c5beacd5fac2157b8441ce88ad169a9bc6b0;hp=bdafe261e9445e15775c431bf78971f48b50ffbf;hpb=3468c7eaa8d7687e8ae89928492b408a4d6c752f;p=p5sagit%2Fp5-mst-13.2.git diff --git a/mg.h b/mg.h index bdafe26..fcac411 100644 --- a/mg.h +++ b/mg.h @@ -1,7 +1,7 @@ /* mg.h * * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999, - * 2000, 2002, 2005, 2006, 2007, by Larry Wall and others + * 2000, 2002, 2005, 2006, 2007, 2008 by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -48,13 +48,13 @@ struct magic { #define MgTAINTEDDIR_off(mg) (mg->mg_flags &= ~MGf_TAINTEDDIR) #define MgPV(mg,lp) ((((int)(lp = (mg)->mg_len)) == HEf_SVKEY) ? \ - SvPV((SV*)((mg)->mg_ptr),lp) : \ + SvPV(MUTABLE_SV((mg)->mg_ptr),lp) : \ (mg)->mg_ptr) #define MgPV_const(mg,lp) ((((int)(lp = (mg)->mg_len)) == HEf_SVKEY) ? \ - SvPV_const((SV*)((mg)->mg_ptr),lp) : \ + SvPV_const(MUTABLE_SV((mg)->mg_ptr),lp) : \ (const char*)(mg)->mg_ptr) -#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ - SvPV_nolen_const((SV*)((mg)->mg_ptr)) : \ +#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ + SvPV_nolen_const(MUTABLE_SV((mg)->mg_ptr)) : \ (const char*)(mg)->mg_ptr) #define SvTIED_mg(sv,how) (SvRMAGICAL(sv) ? mg_find((sv),(how)) : NULL)