From: Vincent Pit <vince@profvince.com>
Date: Thu, 13 Nov 2008 22:45:28 +0000 (+0100)
Subject: Fix building for maint-5.8
X-Git-Tag: v0.26~4
X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=66e0fff9ba0033da3d616a042d98855eda348f97;p=perl%2Fmodules%2FVariable-Magic.git

Fix building for maint-5.8
---

diff --git a/Magic.xs b/Magic.xs
index 35084d2..3df5970 100644
--- a/Magic.xs
+++ b/Magic.xs
@@ -113,21 +113,22 @@ STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) {
 # define MGf_LOCAL 0
 #endif
 
-/* uvar magic and Hash::Util::FieldHash were commited with p28419 */
+/* 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)
 # define VMG_UVAR 1
 #else
 # define VMG_UVAR 0
 #endif
 
-#if !defined(VMG_COMPAT_ARRAY_PUSH_NOLEN) && (VMG_HAS_PERL_BRANCH(5, 8, 9) || VMG_HAS_PERL_MAINT(5, 9, 3, 25854) || VMG_HAS_PERL(5, 10, 0))
+/* Applied to dev-5.9 as 25854, integrated to maint-5.8 as 28160 */
+#if !defined(VMG_COMPAT_ARRAY_PUSH_NOLEN) && (VMG_HAS_PERL_MAINT(5, 8, 9, 28160) || VMG_HAS_PERL_MAINT(5, 9, 3, 25854) || VMG_HAS_PERL(5, 10, 0))
 # define VMG_COMPAT_ARRAY_PUSH_NOLEN 1
 #else
 # define VMG_COMPAT_ARRAY_PUSH_NOLEN 0
 #endif
 
-/* since 5.9.5 - see #43357 */
-#if VMG_HAS_PERL_BRANCH(5, 8, 9) || VMG_HAS_PERL_MAINT(5, 9, 5, 31473) || VMG_HAS_PERL(5, 10, 0)
+/* Applied to dev-5.9 as 31473 (see #43357), integrated to maint-5.8 as 32542 */
+#if VMG_HAS_PERL_MAINT(5, 8, 9, 32542) || VMG_HAS_PERL_MAINT(5, 9, 5, 31473) || VMG_HAS_PERL(5, 10, 0)
 # define VMG_COMPAT_ARRAY_UNDEF_CLEAR 1
 #else
 # define VMG_COMPAT_ARRAY_UNDEF_CLEAR 0