#define XS(name) void name(cv) CV* cv;
#endif
+#if 0 /*defined(WIN32) && defined(__GNUC__)*/ /* this bug is gone in mingw32/gcc-2.8.0*/
+#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
#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. */
#ifdef XS_VERSION
# define XS_VERSION_BOOTCHECK \
STMT_START { \
- char vn[255], *module = SvPV(ST(0),na); \
+ 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 { \
- 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)); \
+ 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