From: Vincent Pit Date: Fri, 15 May 2009 17:49:44 +0000 (+0200) Subject: Drop support for 5.9.5 X-Git-Tag: v0.35~2 X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=37926b8c057b722b7e0f5b6edaa10fd9d01a20ec;p=perl%2Fmodules%2FVariable-Magic.git Drop support for 5.9.5 uvar magic now requires 5.10. --- diff --git a/Magic.xs b/Magic.xs index 218819f..13ffad0 100644 --- a/Magic.xs +++ b/Magic.xs @@ -135,8 +135,9 @@ STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) { # endif #endif -/* uvar magic and Hash::Util::FieldHash were commited with 28419 */ -#if VMG_HAS_PERL_MAINT(5, 9, 4, 28419) || VMG_HAS_PERL(5, 10, 0) +/* uvar magic and Hash::Util::FieldHash were commited with 28419, but only + * enable it on 5.10 */ +#if VMG_HAS_PERL(5, 10, 0) # define VMG_UVAR 1 #else # define VMG_UVAR 0 @@ -812,7 +813,7 @@ STATIC int vmg_svt_clear(pTHX_ SV *sv, MAGIC *mg) { STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) { const MGWIZ *w; -#if VMG_HAS_PERL(5, 10, 0) +#if VMG_HAS_PERL(5, 9, 5) PERL_CONTEXT saved_cx; I32 cxix; #endif @@ -853,7 +854,7 @@ STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) { if (had_err) flags |= G_KEEPERR; -#if VMG_HAS_PERL(5, 10, 0) +#if VMG_HAS_PERL(5, 9, 5) /* This context should not be used anymore, but since we croak in places the * core doesn't even dare to, some pointers to it may remain in the upper call * stack. Make sure call_sv() doesn't clobber it. */ @@ -866,7 +867,7 @@ STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) { call_sv(w->cb_free, flags); -#if VMG_HAS_PERL(5, 10, 0) +#if VMG_HAS_PERL(5, 9, 5) cxstack[cxix] = saved_cx; #endif