Support perl >= 5.13.3

[p5sagit/Sub-Name.git] / Name.xs

diff --git a/Name.xs b/Name.xs
index 6a4dc32..2c669bd 100644 (file)
--- a/Name.xs
+++ b/Name.xs
@@ -1,6 +1,5 @@
-/* $Id: Name.xs,v 1.5 2004/08/18 13:21:44 xmath Exp $
- * Copyright (C) 2004  Matthijs van Duin.  All rights reserved.
- * This program is free software; you can redistribute it and/or modify 
+/* Copyright (C) 2004, 2008  Matthijs van Duin.  All rights reserved.
+ * This program is free software; you can redistribute it and/or modify
  * it under the same terms as Perl itself.
  */
 
@@ -10,6 +9,15 @@
 
 static MGVTBL subname_vtbl;
 
+#ifndef PERL_MAGIC_ext
+# define PERL_MAGIC_ext '~'
+#endif
+
+#ifndef SvMAGIC_set
+#define SvMAGIC_set(sv, val) (SvMAGIC(sv) = (val))
+#endif
+
+
 MODULE = Sub::Name  PACKAGE = Sub::Name
 
 PROTOTYPES: DISABLE
@@ -33,7 +41,8 @@ subname(name, sub)
        else if (!SvOK(sub))
                croak(PL_no_usym, "a subroutine");
        else if (PL_op->op_private & HINT_STRICT_REFS)
-               croak(PL_no_symref, SvPV_nolen(sub), "a subroutine");
+               croak("Can't use string (\"%.32s\") as %s ref while \"strict refs\" in use",
+                     SvPV_nolen(sub), "a subroutine");
        else if ((gv = gv_fetchpv(SvPV_nolen(sub), FALSE, SVt_PVCV)))
                cv = GvCVu(gv);
        if (!cv)
@@ -60,20 +69,28 @@ subname(name, sub)
        if (CvPADLIST(cv)) {
                /* cheap way to refcount the gv */
                av_store((AV *) AvARRAY(CvPADLIST(cv))[0], 0, (SV *) gv);
-       }
+       } else
 #endif
-       else {
+       {
                /* expensive way to refcount the gv */
                MAGIC *mg = SvMAGIC(cv);
                while (mg && mg->mg_virtual != &subname_vtbl)
                        mg = mg->mg_moremagic;
-               if (!mg)
-                       mg = sv_magicext((SV *) cv, NULL, PERL_MAGIC_ext,
-                                       &subname_vtbl, NULL, 0);
+               if (!mg) {
+                       Newz(702, mg, 1, MAGIC);
+                       mg->mg_moremagic = SvMAGIC(cv);
+                       mg->mg_type = PERL_MAGIC_ext;
+                       mg->mg_virtual = &subname_vtbl;
+                       SvMAGIC_set(cv, mg);
+               }
                if (mg->mg_flags & MGf_REFCOUNTED)
                        SvREFCNT_dec(mg->mg_obj);
                mg->mg_flags |= MGf_REFCOUNTED;
                mg->mg_obj = (SV *) gv;
        }
+#ifndef CvGV_set
        CvGV(cv) = gv;
+#else
+       CvGV_set(cv, gv);
+#endif
        PUSHs(sub);