X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=universal.c;h=7d8ced3b0fa2f8fa2b83ccb09cda80a913d8bdee;hb=7e3cfbc1cd50bd5f1a5169e03634c44e2dbcb2a1;hp=d0ef90dcdbcd5d2f72569ec3dc0c7f78f33875e5;hpb=73a462964be81fd1ed02a757d25ecbbf6c0e2686;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/universal.c b/universal.c
index d0ef90d..7d8ced3 100644
--- a/universal.c
+++ b/universal.c
@@ -7,7 +7,7 @@
  */
 
 STATIC SV *
-isa_lookup(HV *stash, char *name, int len, int level)
+isa_lookup(HV *stash, const char *name, int len, int level)
 {
     AV* av;
     GV* gv;
@@ -73,7 +73,7 @@ isa_lookup(HV *stash, char *name, int len, int level)
 }
 
 bool
-sv_derived_from(SV *sv, char *name)
+sv_derived_from(SV *sv, const char *name)
 {
     SV *rv;
     char *type;
@@ -113,12 +113,13 @@ XS(XS_UNIVERSAL_isa)
     dXSARGS;
     SV *sv;
     char *name;
+    STRLEN n_a;
 
     if (items != 2)
 	croak("Usage: UNIVERSAL::isa(reference, kind)");
 
     sv = ST(0);
-    name = (char *)SvPV(ST(1),PL_na);
+    name = (char *)SvPV(ST(1),n_a);
 
     ST(0) = boolSV(sv_derived_from(sv, name));
     XSRETURN(1);
@@ -131,12 +132,13 @@ XS(XS_UNIVERSAL_can)
     char *name;
     SV   *rv;
     HV   *pkg = NULL;
+    STRLEN n_a;
 
     if (items != 2)
 	croak("Usage: UNIVERSAL::can(object-ref, method)");
 
     sv = ST(0);
-    name = (char *)SvPV(ST(1),PL_na);
+    name = (char *)SvPV(ST(1),n_a);
     rv = &PL_sv_undef;
 
     if(SvROK(sv)) {
@@ -191,9 +193,11 @@ XS(XS_UNIVERSAL_VERSION)
         undef = "(undef)";
     }
 
-    if (items > 1 && (undef || (req = SvNV(ST(1)), req > SvNV(sv))))
+    if (items > 1 && (undef || (req = SvNV(ST(1)), req > SvNV(sv)))) {
+	STRLEN n_a;
 	croak("%s version %s required--this is only version %s",
-	      HvNAME(pkg), SvPV(ST(1),PL_na), undef ? undef : SvPV(sv,PL_na));
+	      HvNAME(pkg), SvPV(ST(1),n_a), undef ? undef : SvPV(sv,n_a));
+    }
 
     ST(0) = sv;