missing integration in previous change

[perl5.git] / XSUB.h

diff --git a/XSUB.h b/XSUB.h
index 4165868..f847886 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -57,8 +57,8 @@
 #ifdef XS_VERSION
 #  define XS_VERSION_BOOTCHECK \
     STMT_START {                                                       \
-       SV *tmpsv;                                                      \
-       char *vn = Nullch, *module = SvPV(ST(0),PL_na);                 \
+       SV *tmpsv; STRLEN n_a;                                          \
+       char *vn = Nullch, *module = SvPV(ST(0),n_a);                   \
        if (items >= 2)  /* version supplied as bootstrap arg */        \
            tmpsv = ST(1);                                              \
        else {                                                          \
@@ -69,7 +69,7 @@
                tmpsv = perl_get_sv(form("%s::%s", module,              \
                                      vn = "VERSION"), FALSE);          \
        }                                                               \
-       if (tmpsv && (!SvOK(tmpsv) || strNE(XS_VERSION, SvPV(tmpsv, PL_na))))   \
+       if (tmpsv && (!SvOK(tmpsv) || strNE(XS_VERSION, SvPV(tmpsv, n_a))))     \
            croak("%s object version %s does not match %s%s%s%s %_",    \
                  module, XS_VERSION,                                   \
                  vn ? "$" : "", vn ? module : "", vn ? "::" : "",      \
@@ -108,10 +108,8 @@
 #  ifdef USE_LOCALE_COLLATE
 #    define VTBL_collxfrm      get_vtbl(want_vtbl_collxfrm)
 #  endif
-#  ifdef OVERLOAD
-#    define VTBL_amagic                get_vtbl(want_vtbl_amagic)
-#    define VTBL_amagicelem    get_vtbl(want_vtbl_amagicelem)
-#  endif
+#  define VTBL_amagic          get_vtbl(want_vtbl_amagic)
+#  define VTBL_amagicelem      get_vtbl(want_vtbl_amagicelem)
 #else
 #  define VTBL_sv              &PL_vtbl_sv
 #  define VTBL_env             &PL_vtbl_env
@@ -141,10 +139,8 @@
 #  ifdef USE_LOCALE_COLLATE
 #    define VTBL_collxfrm      &PL_vtbl_collxfrm
 #  endif
-#  ifdef OVERLOAD
-#    define VTBL_amagic                &PL_vtbl_amagic
-#    define VTBL_amagicelem    &PL_vtbl_amagicelem
-#  endif
+#  define VTBL_amagic          &PL_vtbl_amagic
+#  define VTBL_amagicelem      &PL_vtbl_amagicelem
 #endif
 
 #ifdef PERL_OBJECT
@@ -207,6 +203,7 @@
 #    define telldir            PerlDir_tell
 #    define putenv             PerlEnv_putenv
 #    define getenv             PerlEnv_getenv
+#    define uname              PerlEnv_uname
 #    define stdin              PerlIO_stdin()
 #    define stdout             PerlIO_stdout()
 #    define stderr             PerlIO_stderr()