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

diff --git a/XSUB.h b/XSUB.h
index 78a922d..a7987f4 100644
--- a/XSUB.h
+++ b/XSUB.h
@@ -26,12 +26,32 @@
 #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 \
+    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