diff options
| author | Chip Salzenberg <chip@pobox.com> | 1998-03-03 04:02:16 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-03-03 04:02:16 +0000 |
| commit | ae66e5c8da1e140f494c5cf16334db605c3aac5a (patch) | |
| tree | 2835d45ef2144365954e5f6a208f249f465d5d7e /XSUB.h | |
| parent | 67d7c1675ae115b26a6ef023dbb4fa7edfd4c83f (diff) | |
| download | perl-ae66e5c8da1e140f494c5cf16334db605c3aac5a.tar.gz | |
[win32] manually apply another conflicting maintpatch
#64: "Fix extension version mismatch message"
Files: XSUB.h
p4raw-id: //depot/win32/perl@638
Diffstat (limited to 'XSUB.h')
| -rw-r--r-- | XSUB.h | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -6,13 +6,6 @@ #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; \ @@ -50,8 +43,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); \ + char *vn = Nullch, *module = SvPV(ST(0),na); \ if (items >= 2) /* version supplied as bootstrap arg */ \ Sv = ST(1); \ else { \ @@ -62,9 +54,11 @@ 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); \ + if (Sv && (!SvOK(Sv) || strNE(XS_VERSION, SvPV(Sv, na)))) \ + croak("%s object version %s does not match %s%s%s%s %_", \ + module, XS_VERSION, \ + vn ? "$" : "", vn ? module : "", vn ? "::" : "", \ + vn ? vn : "bootstrap parameter", Sv); \ } STMT_END #else # define XS_VERSION_BOOTCHECK |