Compatibility fix for 5.11.1

diff --git a/Magic.xs b/Magic.xs
index db8e2308e4cb630088cbf98d3b7bab7fbe1ba628..628bf5666c8602338f06db61241facbc58479de9 100644 (file)
--- a/Magic.xs
+++ b/Magic.xs
@@ -152,6 +152,8 @@ 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
 # endif
 # ifndef VMG_COMPAT_ARRAY_PUSH_NOLEN_VOID

diff --git a/Makefile.PL b/Makefile.PL
index d541a7c00c1f6e49cd582573d44098b1b4c6e023..a4bd42e8b3d0a7a452e3967edeea79052e8288c2 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -42,9 +42,10 @@ if ($^V eq v5.8.8) {
 print $is_as ? "yes\n" : "no\n";
 
 my $is_5110rel = 0;
-print "Checking if this is a released perl 5.11.0... ";
-if ($^V eq v5.11.0 and not defined $pl) {
+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';