X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Magic.xs;h=85d7c85133e4df513efd0fddb77fee7e22758594;hb=c01835268b81dbfdc578a5d6c0e782c376a30923;hp=c1e582ff13061d2fef15377983f7f58c77381a3b;hpb=c471e8c9f86ad8817761816101358f8ae1035915;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/Magic.xs b/Magic.xs
index c1e582f..85d7c85 100644
--- a/Magic.xs
+++ b/Magic.xs
@@ -40,6 +40,10 @@
 # define SvMAGIC_set(sv, val) (SvMAGIC(sv) = (val))
 #endif
 
+#ifndef mPUSHi
+# define mPUSHi(I) PUSHs(sv_2mortal(newSViv(I)))
+#endif
+
 #ifndef dMY_CXT
 # define MY_CXT vmg_globaldata
 # define dMY_CXT
@@ -63,7 +67,8 @@
 # define MGf_LOCAL 0
 #endif
 
-#if PERL_API_VERSION_GE(5, 10, 0)
+/* uvar magic and Hash::Util::FieldHash were commited with p28419 */
+#if (VMG_PERL_PATCHLEVEL >= 28419) || (!VMG_PERL_PATCHLEVEL && PERL_VERSION_GE(5, 9, 4))
 # define VMG_UVAR 1
 #else
 # define VMG_UVAR 0
@@ -90,7 +95,7 @@
 
 #if VMG_UVAR
 
-/* Bug-free mg_magical - see http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2008-01/msg00036.html, but specialized to our needs. */
+/* Bug-free mg_magical - see http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2008-01/msg00036.html - but specialized to our needs. */
 STATIC void vmg_sv_magicuvar(pTHX_ SV *sv, const char *uf, I32 len) {
 #define vmg_sv_magicuvar(S, U, L) vmg_sv_magicuvar(aTHX_ (S), (U), (L))
  const MAGIC* mg;
@@ -102,22 +107,12 @@ STATIC void vmg_sv_magicuvar(pTHX_ SV *sv, const char *uf, I32 len) {
   do {
    const MGVTBL* const vtbl = mg->mg_virtual;
    if (vtbl) {
-/* 
-    if (vtbl->svt_get && !(mg->mg_flags & MGf_GSKIP))
-     SvGMAGICAL_on(sv);
-    if (vtbl->svt_set)
-     SvSMAGICAL_on(sv);
-*/
     if (vtbl->svt_clear) {
      SvRMAGICAL_on(sv);
      break;
     }
    }
   } while ((mg = mg->mg_moremagic));
-/*
-  if (!(SvFLAGS(sv) & (SVs_GMG|SVs_SMG)))
-   SvRMAGICAL_on(sv);
-*/
  }
 }