diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-03-07 07:51:28 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-03-07 07:51:28 +0000 |
| commit | 3bd495df69b982704c59fc1ecbed71e5112e7da0 (patch) | |
| tree | 47303adb4596ab4c7c0b981f50c0a72d52092338 /XSUB.h | |
| parent | fe9f1ed50ae7ad31787549184f98f0a71eda0191 (diff) | |
| parent | 1d16519d77cbada019f865cb923236cd48a23c72 (diff) | |
| download | perl-3bd495df69b982704c59fc1ecbed71e5112e7da0.tar.gz | |
[win32] integrate mainline changes
p4raw-id: //depot/asperl@799
Diffstat (limited to 'XSUB.h')
| -rw-r--r-- | XSUB.h | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -10,13 +10,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; \ @@ -54,8 +47,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 { \ @@ -66,9 +58,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 |