perl5.004 on AIX: Patches

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

diff --git a/XSUB.h b/XSUB.h
index aaa4c22..a7987f4 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -39,23 +39,18 @@
 #ifdef XS_VERSION
 # define XS_VERSION_BOOTCHECK \
     STMT_START {                                                       \
-       char vn[255], *module = SvPV(ST(0),na);                         \
+       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(vn = form("%s::XS_VERSION", module), FALSE); \
+           if (!Sv || !SvOK(Sv))                                       \
+               Sv = perl_get_sv(vn = form("%s::VERSION", module), FALSE); \
        }                                                               \
-       if (!Sv || !SvOK(Sv))                                           \
-           croak("%s object can't find $%s::XS_VERSION or $%s::VERSION", \
-                 module, module, module);                              \
-       else if (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 %_",         \
+                 module, XS_VERSION, vn, Sv);                          \
     } STMT_END
 #else
 # define XS_VERSION_BOOTCHECK