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

diff --git a/XSUB.h b/XSUB.h
index 10aed07..06dc023 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -2,7 +2,7 @@
 
 #ifdef CAN_PROTOTYPE
 #ifdef PERL_OBJECT
-#define XS(name) void name(CPerlObj* pPerl, CV* cv)
+#define XS(name) void name(CV* cv, CPerlObj* pPerl)
 #else
 #define XS(name) void name(CV* cv)
 #endif
@@ -10,15 +10,8 @@
 #define XS(name) void name(cv) CV* cv;
 #endif
 
-#if defined(WIN32) && defined(__GNUC__)
-#define STRINGIFY_THINGY(x) #x
-#define FORCE_ARG_STRING(x) STRINGIFY_THINGY(x)
-#else
-#define FORCE_ARG_STRING(x) x
-#endif
-
 #define dXSARGS				\
-	dSP; dMARK;		\
+	dSP; dMARK;			\
 	I32 ax = mark - stack_base + 1;	\
 	I32 items = sp - mark
 
@@ -54,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 {								\
@@ -66,9 +58,11 @@
 		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
@@ -76,4 +70,13 @@
 
 #ifdef PERL_OBJECT
 #include "ObjXSub.h"
-#endif
\ No newline at end of file
+#ifndef NO_XSLOCKS
+#ifdef WIN32
+#include "XSLock.h"
+#endif  /* WIN32 */
+#endif  /* NO_XSLOCKS */
+#else
+#ifdef PERL_CAPI
+#include "PerlCAPI.h"
+#endif
+#endif	/* PERL_OBJECT */