X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xsutils.c;h=900ec3fcec73a6a0e8d4c68094b29794429ee918;hb=6ae7e45950bbea01cc8774a8c6c78ed87228651c;hp=59a249616b59051c29e43ac7e283c85f77950441;hpb=97aff369fa5580e7a888d4fa4c86be74ab000409;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/xsutils.c b/xsutils.c
index 59a2496..900ec3f 100644
--- a/xsutils.c
+++ b/xsutils.c
@@ -23,7 +23,6 @@
  */
 
 /* package attributes; */
-PERL_XS_EXPORT_C void XS_attributes__warn_reserved(pTHX_ CV *cv);
 PERL_XS_EXPORT_C void XS_attributes_reftype(pTHX_ CV *cv);
 PERL_XS_EXPORT_C void XS_attributes__modify_attrs(pTHX_ CV *cv);
 PERL_XS_EXPORT_C void XS_attributes__guess_stash(pTHX_ CV *cv);
@@ -43,11 +42,11 @@ PERL_XS_EXPORT_C void XS_attributes_bootstrap(pTHX_ CV *cv);
  * version checks in these bootstrap calls are optional.
  */
 
+static const char file[] = __FILE__;
+
 void
 Perl_boot_core_xsutils(pTHX)
 {
-    const char file[] = __FILE__;
-
     newXS("attributes::bootstrap",	XS_attributes_bootstrap,	file);
 }
 
@@ -85,8 +84,8 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 #endif
 	    case 6:
 		switch (name[3]) {
-		case 'l':
 #ifdef CVf_LVALUE
+		case 'l':
 		    if (memEQ(name, "lvalue", 6)) {
 			if (negated)
 			    CvFLAGS((CV*)sv) &= ~CVf_LVALUE;
@@ -95,8 +94,8 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 			continue;
 		    }
 		    break;
+#endif
 		case 'k':
-#endif /* defined CVf_LVALUE */
 		    if (memEQ(name, "locked", 6)) {
 			if (negated)
 			    CvFLAGS((CV*)sv) &= ~CVf_LOCKED;
@@ -162,12 +161,10 @@ XS(XS_attributes_bootstrap)
 {
     dVAR;
     dXSARGS;
-    const char file[] = __FILE__;
 
     if( items > 1 )
         Perl_croak(aTHX_ "Usage: attributes::bootstrap $module");
 
-    newXSproto("attributes::_warn_reserved", XS_attributes__warn_reserved, file, "");
     newXS("attributes::_modify_attrs",	XS_attributes__modify_attrs,	file);
     newXSproto("attributes::_guess_stash", XS_attributes__guess_stash, file, "$");
     newXSproto("attributes::_fetch_attrs", XS_attributes__fetch_attrs, file, "$");
@@ -278,10 +275,6 @@ usage:
 	    else if (/* !CvANON(sv) && */ CvSTASH(sv))
 		stash = CvSTASH(sv);
 	    break;
-	case SVt_PVMG:
-	    if (!(SvFAKE(sv) && SvTIED_mg(sv, PERL_MAGIC_glob)))
-		break;
-	    /*FALLTHROUGH*/
 	case SVt_PVGV:
 	    if (GvGP(sv) && GvESTASH((GV*)sv))
 		stash = GvESTASH((GV*)sv);
@@ -322,22 +315,6 @@ usage:
     XSRETURN(1);
 }
 
-XS(XS_attributes__warn_reserved)
-{
-    dVAR;
-    dXSARGS;
-
-    if (items != 0) {
-	Perl_croak(aTHX_
-		   "Usage: attributes::_warn_reserved ()");
-    }
-
-    EXTEND(SP,1);
-    ST(0) = boolSV(ckWARN(WARN_RESERVED));
-
-    XSRETURN(1);
-}
-
 /*
  * Local variables:
  * c-indentation-style: bsd