X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=f7d04a84fad9aca30b516e274e95551483422065;hb=83f957ec18f48986bbac4f0b35e66bbc0e02ccdf;hp=52f66a600a7cc812a47d548adb3fe970b5c9fc34;hpb=95fad9186c8842cfbbfcf6573db9e0dcadbce69c;p=p5sagit%2Fp5-mst-13.2.git diff --git a/XSUB.h b/XSUB.h index 52f66a6..f7d04a8 100644 --- a/XSUB.h +++ b/XSUB.h @@ -1,7 +1,7 @@ /* XSUB.h * - * Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, 2005 by Larry Wall and others + * Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + * 2003, 2004, 2005, 2006, 2007 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. @@ -82,20 +82,36 @@ is a lexical $_ in scope. =cut */ +#ifndef PERL_UNUSED_ARG +# if defined(lint) && defined(S_SPLINT_S) /* www.splint.org */ +# include +# define PERL_UNUSED_ARG(x) NOTE(ARGUNUSED(x)) +# else +# define PERL_UNUSED_ARG(x) ((void)x) +# endif +#endif +#ifndef PERL_UNUSED_VAR +# define PERL_UNUSED_VAR(x) ((void)x) +#endif + #define ST(off) PL_stack_base[ax + (off)] #undef XS #if defined(__CYGWIN__) && defined(USE_DYNAMIC_LOADING) # define XS(name) __declspec(dllexport) void name(pTHX_ CV* cv) #endif -#if defined(SYMBIAN) +#if defined(__SYMBIAN32__) # define XS(name) EXPORT_C void name(pTHX_ CV* cv) #endif #ifndef XS -# ifdef HASATTRIBUTE_UNUSED +# if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus) # define XS(name) void name(pTHX_ CV* cv __attribute__unused__) # else -# define XS(name) void name(pTHX_ CV* cv) +# ifdef __cplusplus +# define XS(name) extern "C" void name(pTHX_ CV* cv) +# else +# define XS(name) void name(pTHX_ CV* cv) +# endif # endif #endif @@ -103,12 +119,18 @@ is a lexical $_ in scope. #define dAXMARK \ I32 ax = POPMARK; \ - register SV ** const mark = PL_stack_base + ax++ + register SV **mark = PL_stack_base + ax++ #define dITEMS I32 items = SP - MARK -#define dXSARGS \ +#if defined(lint) && defined(S_SPLINT_S) /* www.splint.org */ +# define dXSARGS \ + NOTE(ARGUNUSED(cv)) \ + dSP; dAXMARK; dITEMS +#else +# define dXSARGS \ dSP; dAXMARK; dITEMS +#endif #define dXSTARG SV * const targ = ((PL_op->op_private & OPpENTERSUB_HASTARG) \ ? PAD_SV(PL_op->op_targ) : sv_newmortal()) @@ -130,9 +152,9 @@ is a lexical $_ in scope. #define XSINTERFACE_FUNC_SET(cv,f) \ CvXSUBANY(cv).any_dxptr = (void (*) (pTHX_ void*))(f) -#define dUNDERBAR I32 padoff_du = find_rundefsvoffset() +#define dUNDERBAR PADOFFSET padoff_du = find_rundefsvoffset() #define UNDERBAR ((padoff_du == NOT_IN_PAD \ - || PAD_COMPNAME_FLAGS(padoff_du) & SVpad_OUR) \ + || PAD_COMPNAME_FLAGS_isOUR(padoff_du)) \ ? DEFSV : PAD_SVl(padoff_du)) /* Simple macros to put new mortal values onto the stack. */ @@ -211,7 +233,7 @@ C. See L. =head1 Simple Exception Handling Macros =for apidoc Ams||dXCPT -Set up neccessary local variables for exception handling. +Set up necessary local variables for exception handling. See L. =for apidoc AmU||XCPT_TRY_START @@ -255,13 +277,13 @@ Rethrows a previously caught exception. See L. #define XSRETURN_UNDEF STMT_START { XST_mUNDEF(0); XSRETURN(1); } STMT_END #define XSRETURN_EMPTY STMT_START { XSRETURN(0); } STMT_END -#define newXSproto(a,b,c,d) sv_setpv((SV*)newXS(a,b,c), d) +#define newXSproto(a,b,c,d) newXS_flags(a,b,c,d,0) #ifdef XS_VERSION # define XS_VERSION_BOOTCHECK \ STMT_START { \ SV *_sv; \ - const char *vn = Nullch, *module = SvPV_nolen_const(ST(0)); \ + const char *vn = NULL, *module = SvPV_nolen_const(ST(0)); \ if (items >= 2) /* version supplied as bootstrap arg */ \ _sv = ST(1); \ else { \ @@ -273,15 +295,15 @@ Rethrows a previously caught exception. See L. vn = "VERSION"), FALSE); \ } \ if (_sv) { \ - SV *xssv = Perl_newSVpvf(aTHX_ "%s",XS_VERSION); \ + SV *xssv = Perl_newSVpv(aTHX_ XS_VERSION, 0); \ xssv = new_version(xssv); \ if ( !sv_derived_from(_sv, "version") ) \ _sv = new_version(_sv); \ if ( vcmp(_sv,xssv) ) \ Perl_croak(aTHX_ "%s object version %"SVf" does not match %s%s%s%s %"SVf,\ - module, vstringify(xssv), \ + module, SVfARG(vstringify(xssv)), \ vn ? "$" : "", vn ? module : "", vn ? "::" : "", \ - vn ? vn : "bootstrap parameter", vstringify(_sv));\ + vn ? vn : "bootstrap parameter", SVfARG(vstringify(_sv)));\ } \ } STMT_END #else @@ -302,7 +324,7 @@ Rethrows a previously caught exception. See L. */ #define DBM_setFilter(db_type,code) \ - { \ + STMT_START { \ if (db_type) \ RETVAL = sv_mortalcopy(db_type) ; \ ST(0) = RETVAL ; \ @@ -316,9 +338,10 @@ Rethrows a previously caught exception. See L. else \ db_type = newSVsv(code) ; \ } \ - } + } STMT_END #define DBM_ckFilter(arg,type,name) \ + STMT_START { \ if (db->type) { \ if (db->filtering) { \ croak("recursion detected in %s", name) ; \ @@ -342,8 +365,7 @@ Rethrows a previously caught exception. See L. if (name[7] == 's'){ \ arg = sv_2mortal(arg); \ } \ - SvOKp(arg); \ - } + } } STMT_END #if 1 /* for compatibility */ # define VTBL_sv &PL_vtbl_sv @@ -379,6 +401,12 @@ Rethrows a previously caught exception. See L. #endif #include "perlapi.h" +#ifndef PERL_MAD +# undef PL_madskills +# undef PL_xmlfp +# define PL_madskills 0 +# define PL_xmlfp 0 +#endif #if defined(PERL_IMPLICIT_CONTEXT) && !defined(PERL_NO_GET_CONTEXT) && !defined(PERL_CORE) # undef aTHX @@ -601,3 +629,13 @@ Rethrows a previously caught exception. See L. #endif /* PERL_IMPLICIT_SYS && !PERL_CORE */ #endif /* _INC_PERL_XSUB_H */ /* include guard */ + +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * + * ex: set ts=8 sts=4 sw=4 noet: + */