[PATCH 5.004_60] Fix to MM_VMS.PM

[p5sagit/p5-mst-13.2.git] / XSUB.h

diff --git a/XSUB.h b/XSUB.h
index 054b4cc..f01f497 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -6,6 +6,13 @@
 #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;             \
        I32 ax = mark - stack_base + 1; \
@@ -43,6 +50,7 @@
 #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);                                                 \
@@ -54,9 +62,9 @@
                Sv = perl_get_sv(form("%s::%s", module,                 \
                                      vn = "VERSION"), FALSE);          \
        }                                                               \
-       if (Sv && (!SvOK(Sv) || strNE(XS_VERSION, 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);                  \
+                 module, xs_version, module, vn, Sv);                  \
     } STMT_END
 #else
 # define XS_VERSION_BOOTCHECK