X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/20ce7b12268a3d32b5b246928de5084322e709cf..c355877e9e68fb3e29329a13c757988acfe97ffd:/mg.h diff --git a/mg.h b/mg.h index ebd47c3..e99b52c 100644 --- a/mg.h +++ b/mg.h @@ -1,6 +1,6 @@ /* mg.h * - * Copyright (c) 1991-1999, Larry Wall + * Copyright (c) 1991-2002, 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,14 @@ 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); + int (CPERLscope(*svt_copy)) (pTHX_ SV *sv, MAGIC* mg, + SV *nsv, const char *name, int namlen); + int (CPERLscope(*svt_dup)) (pTHX_ MAGIC *mg, CLONE_PARAMS *param); }; #endif @@ -33,6 +36,8 @@ struct magic { #define MGf_TAINTEDDIR 1 #define MGf_REFCOUNTED 2 #define MGf_GSKIP 4 +#define MGf_COPY 8 +#define MGf_DUP 16 #define MGf_MINMATCH 1 @@ -40,7 +45,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)