X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=75e65cf1dbb6624cc03a04e1eda3b585f9839a5b;hb=cf8a9db467fa754b0ba7997123e634898cfd9234;hp=65c33c9a4e15b8f416ba4bf659596fee284b7d2e;hpb=46fc3d4c69a0adf236bfcba70daee7fd597cf30d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/XSUB.h b/XSUB.h
index 65c33c9..75e65cf 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -6,8 +6,15 @@
 #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
 
@@ -15,7 +22,11 @@
 
 #define dXSI32 I32 ix = XSANY.any_i32
 
-#define XSRETURN(off) stack_sp = stack_base + ax + ((off) - 1); return
+#define XSRETURN(off)					\
+    STMT_START {					\
+	stack_sp = stack_base + ax + ((off) - 1);	\
+	return;						\
+    } STMT_END
 
 /* Simple macros to put new mortal values onto the stack.   */
 /* Typically used to return values from XS functions.       */
@@ -39,18 +50,21 @@
 #ifdef XS_VERSION
 # define XS_VERSION_BOOTCHECK \
     STMT_START {							\
+        char *xs_version = FORCE_ARG_STRING(XS_VERSION);			\
 	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); \
+	    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 %S",		\
-		  module, XS_VERSION, vn, Sv);				\
+	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);			\
     } STMT_END
 #else
 # define XS_VERSION_BOOTCHECK