X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=cd8a732be0cd6676afe14fb9e623f0378630c1b1;hb=e91177edb0beae74fd07fb1ec08a528ab1fb63c2;hp=611eac69110d79d99b95c35aa435959bf99e2273;hpb=900941544544b9ca5ecbb5e1f24f9c23b3635b68;p=p5sagit%2Fp5-mst-13.2.git diff --git a/XSUB.h b/XSUB.h index 611eac6..cd8a732 100644 --- a/XSUB.h +++ b/XSUB.h @@ -1,19 +1,17 @@ #define ST(off) stack_base[ax + (off)] #ifdef CAN_PROTOTYPE -#define XS(name) void name(CV* cv) +#ifdef PERL_OBJECT +#define XS(name) void name(CV* cv, CPerlObj* pPerl) #else -#define XS(name) void name(cv) CV* cv; +#define XS(name) void name(CV* cv) #endif - -#if defined(WIN32) && defined(__GNUC__) -#define FORCE_ARG_STRING(x) #x #else -#define FORCE_ARG_STRING(x) x +#define XS(name) void name(cv) CV* cv; #endif #define dXSARGS \ - dSP; dMARK; \ + dSP; dMARK; \ I32 ax = mark - stack_base + 1; \ I32 items = sp - mark @@ -21,6 +19,16 @@ #define dXSI32 I32 ix = XSANY.any_i32 +#ifdef __cplusplus +# define XSINTERFACE_CVT(ret,name) ret (*name)(...) +#else +# define XSINTERFACE_CVT(ret,name) ret (*name)() +#endif +#define dXSFUNCTION(ret) XSINTERFACE_CVT(ret,XSFUNCTION) +#define XSINTERFACE_FUNC(ret,cv,f) ((XSINTERFACE_CVT(ret,))(f)) +#define XSINTERFACE_FUNC_SET(cv,f) \ + CvXSUBANY(cv).any_dptr = (void (*) _((void*)))(f) + #define XSRETURN(off) \ STMT_START { \ stack_sp = stack_base + ax + ((off) - 1); \ @@ -49,8 +57,7 @@ #ifdef XS_VERSION # define XS_VERSION_BOOTCHECK \ STMT_START { \ - char *xs_version = FORCE_ARG_STRING(XS_VERSION); \ - char *vn = "", *module = SvPV(ST(0),na); \ + char *vn = Nullch, *module = SvPV(ST(0),na); \ if (items >= 2) /* version supplied as bootstrap arg */ \ Sv = ST(1); \ else { \ @@ -61,10 +68,25 @@ Sv = perl_get_sv(form("%s::%s", module, \ vn = "VERSION"), FALSE); \ } \ - if (Sv && (!SvOK(Sv) || strNE(xs_version, SvPV(Sv, na)))) \ - croak("%s object version %s does not match $%s::%s %_", \ - module, xs_version, module, vn, Sv); \ + if (Sv && (!SvOK(Sv) || strNE(XS_VERSION, SvPV(Sv, na)))) \ + croak("%s object version %s does not match %s%s%s%s %_", \ + module, XS_VERSION, \ + vn ? "$" : "", vn ? module : "", vn ? "::" : "", \ + vn ? vn : "bootstrap parameter", Sv); \ } STMT_END #else # define XS_VERSION_BOOTCHECK #endif + +#ifdef PERL_OBJECT +#include "ObjXSub.h" +#ifndef NO_XSLOCKS +#ifdef WIN32 +#include "XSLock.h" +#endif /* WIN32 */ +#endif /* NO_XSLOCKS */ +#else +#ifdef PERL_CAPI +#include "PerlCAPI.h" +#endif +#endif /* PERL_OBJECT */