From: Vincent Pit Date: Thu, 23 Sep 2010 21:55:16 +0000 (+0200) Subject: Remove the test for non-released perl 5.11.0 X-Git-Tag: v0.44~7 X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FVariable-Magic.git;a=commitdiff_plain;h=d29a774d106d145036eda849ab57f42410100008 Remove the test for non-released perl 5.11.0 Who would be crazy enough to still use them? And the test seems to break with some git checkouts. --- diff --git a/Magic.xs b/Magic.xs index 0e9ff74..e336abe 100644 --- a/Magic.xs +++ b/Magic.xs @@ -160,9 +160,11 @@ STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) { * reverted to dev-5.11 as 9cdcb38b */ #if VMG_HAS_PERL_MAINT(5, 8, 9, 28160) || VMG_HAS_PERL_MAINT(5, 9, 3, 25854) || VMG_HAS_PERL(5, 10, 0) # ifndef VMG_COMPAT_ARRAY_PUSH_NOLEN -/* This branch should only apply for perls before the official 5.11.0 release. - * Makefile.PL takes care of the higher ones. */ -# define VMG_COMPAT_ARRAY_PUSH_NOLEN 1 +# if VMG_HAS_PERL(5, 11, 0) +# define VMG_COMPAT_ARRAY_PUSH_NOLEN 0 +# else +# define VMG_COMPAT_ARRAY_PUSH_NOLEN 1 +# endif # endif # ifndef VMG_COMPAT_ARRAY_PUSH_NOLEN_VOID # define VMG_COMPAT_ARRAY_PUSH_NOLEN_VOID 1 diff --git a/Makefile.PL b/Makefile.PL index 93598a1..05b4eb3 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -37,18 +37,6 @@ if ($^V eq v5.8.8 and defined $as_perl and $as_perl >= 822) { } print $is_as_822 ? "yes\n" : "no\n"; -my $is_5110rel = 0; -print "Checking if this is a released perl 5.11.0 or higher... "; -if ($^V ge v5.11.0 and not defined $pl) { - my $describe = $Config{git_describe}; - # An empty 'describe' is fine - if (defined $describe and $describe !~ /^GitLive-/) { - $is_5110rel = 1; - push @DEFINES, '-DVMG_COMPAT_ARRAY_PUSH_NOLEN=0'; - } -} -print $is_5110rel ? "yes\n" : "no\n"; - my $is_gcc_34 = 0; print "Checking if this is gcc 3.4 on Windows trying to link against an import library... "; if ($^O eq 'MSWin32' and not grep /^LD[A-Z]*=/, @ARGV) {