X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=c7c3f6d80ed6f10ccc23837a9d335b426749781d;hb=0a5d5e8be390bda2f9b7684490082d428228d28f;hp=a7987f419e9d926b64b6aa01e3d8d1fb98a4c419;hpb=8a38ab241313ca4a51b5fc5b36b207cdb71be4db;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/XSUB.h b/XSUB.h
index a7987f4..c7c3f6d 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -7,7 +7,7 @@
 #endif
 
 #define dXSARGS				\
-	dSP; dMARK;			\
+	dSP; dMARK;		\
 	I32 ax = mark - stack_base + 1;	\
 	I32 items = sp - mark
 
@@ -44,13 +44,15 @@
 	    Sv = ST(1);							\
 	else {								\
 	    /* XXX GV_ADDWARN */					\
-	    Sv = perl_get_sv(vn = form("%s::XS_VERSION", module), FALSE); \
+	    Sv = perl_get_sv(form("%s::%s", module,			\
+				  vn = "XS_VERSION"), FALSE);		\
 	    if (!Sv || !SvOK(Sv))					\
-		Sv = perl_get_sv(vn = form("%s::VERSION", module), FALSE); \
+		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 %_",		\
-		  module, XS_VERSION, vn, Sv);				\
+	    croak("%s object version %s does not match $%s::%s %_",	\
+		  module, XS_VERSION, module, vn, Sv);			\
     } STMT_END
 #else
 # define XS_VERSION_BOOTCHECK