X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=a7987f419e9d926b64b6aa01e3d8d1fb98a4c419;hb=a9581ec21a2686ca09657757555fcd66435bb205;hp=af452ea5d77fbb81a2dbcc74aa7c325c1239c660;hpb=80b92232e4d4ad8078e12cd15b5399299c7f9f9b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/XSUB.h b/XSUB.h
index af452ea..a7987f4 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -38,19 +38,20 @@
 
 #ifdef XS_VERSION
 # define XS_VERSION_BOOTCHECK \
-    STMT_START {                                                                      \
-        char vn[255], *module = SvPV(ST(0),na);                               \
-        if (items >= 2)         /* version supplied as bootstrap arg */       \
-            Sv=ST(1);                                                         \
-        else {                  /* read version from module::VERSION */       \
-            sprintf(vn,"%s::VERSION", module);                                \
-            Sv = perl_get_sv(vn, FALSE);   /* XXX GV_ADDWARN */               \
-        }                                                                     \
-        if (Sv && (!SvOK(Sv) || strNE(XS_VERSION, SvPV(Sv,na))) )             \
-            croak("%s object version %s does not match %s.pm $VERSION %s",    \
-              module,XS_VERSION, module,(Sv && SvOK(Sv))?SvPV(Sv,na):"(undef)");\
+    STMT_START {							\
+	char *vn = "", *module = SvPV(ST(0),na);			\
+	if (items >= 2)	 /* version supplied as bootstrap arg */	\
+	    Sv = ST(1);							\
+	else {								\
+	    /* XXX GV_ADDWARN */					\
+	    Sv = perl_get_sv(vn = form("%s::XS_VERSION", module), FALSE); \
+	    if (!Sv || !SvOK(Sv))					\
+		Sv = perl_get_sv(vn = form("%s::VERSION", module), 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);				\
     } STMT_END
 #else
 # define XS_VERSION_BOOTCHECK
 #endif
-