X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=XSUB.h;h=0b82a270b4638766118e7d15461ba748029cc7ec;hb=c578f5e04970af2516f26d023e8797da5451c90c;hp=f8d31079fcbc7490a605f48c27341a1950530470;hpb=720fb644424900350db135e470934a00919daa13;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/XSUB.h b/XSUB.h
index f8d3107..0b82a27 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -26,31 +26,34 @@
 #define XST_mYES(i)   (ST(i) = &sv_yes  )
 #define XST_mUNDEF(i) (ST(i) = &sv_undef)
  
-#define XSRETURN_IV(v) do { XST_mIV(0,v);  XSRETURN(1); } while (0)
-#define XSRETURN_NV(v) do { XST_mNV(0,v);  XSRETURN(1); } while (0)
-#define XSRETURN_PV(v) do { XST_mPV(0,v);  XSRETURN(1); } while (0)
-#define XSRETURN_NO    do { XST_mNO(0);    XSRETURN(1); } while (0)
-#define XSRETURN_YES   do { XST_mYES(0);   XSRETURN(1); } while (0)
-#define XSRETURN_UNDEF do { XST_mUNDEF(0); XSRETURN(1); } while (0)
-#define XSRETURN_EMPTY do {                XSRETURN(0); } while (0)
+#define XSRETURN_IV(v) STMT_START { XST_mIV(0,v);  XSRETURN(1); } STMT_END
+#define XSRETURN_NV(v) STMT_START { XST_mNV(0,v);  XSRETURN(1); } STMT_END
+#define XSRETURN_PV(v) STMT_START { XST_mPV(0,v);  XSRETURN(1); } STMT_END
+#define XSRETURN_NO    STMT_START { XST_mNO(0);    XSRETURN(1); } STMT_END
+#define XSRETURN_YES   STMT_START { XST_mYES(0);   XSRETURN(1); } STMT_END
+#define XSRETURN_UNDEF STMT_START { XST_mUNDEF(0); XSRETURN(1); } STMT_END
+#define XSRETURN_EMPTY STMT_START {                XSRETURN(0); } STMT_END
 
 #define newXSproto(a,b,c,d)	sv_setpv((SV*)newXS(a,b,c), d)
 
 #ifdef XS_VERSION
 # define XS_VERSION_BOOTCHECK \
-    do {                                                                      \
-        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)");\
-    } while (0)
+    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(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, module, vn, Sv);			\
+    } STMT_END
 #else
 # define XS_VERSION_BOOTCHECK
 #endif
-