X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2Fattrs%2Fattrs.xs;h=4c00cd7cb267b9aeb4f212639287239dba8e9117;hb=785fb66b9a3cb438ed213406a1dec3f5257fd014;hp=da952d5a3f1a40ec977ad0a287bac239d05ed4b8;hpb=6b88bc9c1f6d4b32c70e7ef68f8c65266e431623;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/attrs/attrs.xs b/ext/attrs/attrs.xs
index da952d5..4c00cd7 100644
--- a/ext/attrs/attrs.xs
+++ b/ext/attrs/attrs.xs
@@ -1,3 +1,4 @@
+#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
@@ -26,8 +27,13 @@ char *	Class
     PPCODE:
 	if (!PL_compcv || !(cv = CvOUTSIDE(PL_compcv)))
 	    croak("can't set attributes outside a subroutine scope");
+	if (ckWARN(WARN_DEPRECATED))
+	    Perl_warner(aTHX_ WARN_DEPRECATED,
+			"pragma \"attrs\" is deprecated, "
+			"use \"sub NAME : ATTRS\" instead");
 	for (i = 1; i < items; i++) {
-	    char *attr = SvPV(ST(i), PL_na);
+	    STRLEN n_a;
+	    char *attr = SvPV(ST(i), n_a);
 	    cv_flags_t flag = get_flag(attr);
 	    if (!flag)
 		croak("invalid attribute name %s", attr);
@@ -47,13 +53,14 @@ SV *	sub
 		sub = Nullsv;
 	}
 	else {
-	    char *name = SvPV(sub, PL_na);
+	    STRLEN n_a;
+	    char *name = SvPV(sub, n_a);
 	    sub = (SV*)perl_get_cv(name, FALSE);
 	}
 	if (!sub)
 	    croak("invalid subroutine reference or name");
 	if (CvFLAGS(sub) & CVf_METHOD)
-	    XPUSHs(sv_2mortal(newSVpv("method", 0)));
+	    XPUSHs(sv_2mortal(newSVpvn("method", 6)));
 	if (CvFLAGS(sub) & CVf_LOCKED)
-	    XPUSHs(sv_2mortal(newSVpv("locked", 0)));
+	    XPUSHs(sv_2mortal(newSVpvn("locked", 6)));