X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=b3ea825519f6daa48c6f0fef0a57a872e586aff0;hb=b851de6cd1cc79b5e8ed7db02ebd0a9769d34232;hp=d15af1f498aa2e462ff14048adc1aa16d6c4752f;hpb=255c1af795e05405858a49f2959b3eb083883987;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/XSUB.h b/XSUB.h
index d15af1f..b3ea825 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -7,7 +7,7 @@
 #endif
 
 #define dXSARGS				\
-	dSP; dMARK;			\
+	dTHR; dSP; dMARK;		\
 	I32 ax = mark - stack_base + 1;	\
 	I32 items = sp - mark
 
@@ -39,20 +39,20 @@
 #ifdef XS_VERSION
 # define XS_VERSION_BOOTCHECK \
     STMT_START {							\
-	char vn[255], *module = SvPV(ST(0),na);				\
+	char *vn = "", *module = SvPV(ST(0),na);			\
 	if (items >= 2)	 /* version supplied as bootstrap arg */	\
 	    Sv = ST(1);							\
 	else {								\
-	    sprintf(vn,"%s::XS_VERSION", module);			\
-	    Sv = perl_get_sv(vn, FALSE);   /* XXX GV_ADDWARN */		\
-	    if (!Sv || !SvOK(Sv)) {					\
-		sprintf(vn,"%s::VERSION", module);			\
-		Sv = perl_get_sv(vn, FALSE);   /* XXX GV_ADDWARN */	\
-	    }								\
+	    /* XXX GV_ADDWARN */					\
+	    Sv = perl_get_sv(form("%s::%s", module,			\
+				  vn = "XS_VERSION"), FALSE);		\
+	    if (!Sv || !SvOK(Sv))					\
+		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, vn, SvPV(Sv, na));		\
+	    croak("%s object version %s does not match $%s::%s %_",	\
+		  module, XS_VERSION, module, vn, Sv);			\
     } STMT_END
 #else
 # define XS_VERSION_BOOTCHECK