X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=06dc023694c72925814a2007fe2c6e61a3f0a5a9;hb=5a0924038aa1098308ad491a6148bc59d3045ce6;hp=611eac69110d79d99b95c35aa435959bf99e2273;hpb=900941544544b9ca5ecbb5e1f24f9c23b3635b68;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/XSUB.h b/XSUB.h
index 611eac6..06dc023 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
 
@@ -49,8 +47,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 +58,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 */