VMG_COMPAT_ARRAY_PUSH_NOLEN needs to be enabled for AS Perl 5.8 with build >= 822

diff --git a/Makefile.PL b/Makefile.PL
index 90cf373092b47adc033393fcae8ead4424285bbc..f20a99f62d5a956a7f14874bcace2664f98b1828 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,14 +23,18 @@ if (defined $pl && length $pl) {
 }
 
 my $is_as = 0;
-print "Checking if this is Windows ActiveState 5.8.[78]... ";
-if ($^O eq 'MSWin32' && $^V ge v5.8.7 && $^V lt v5.8.9) {
+print "Checking if this is ActiveState Perl 5.8.8 build 822 or higher... ";
+if ($^V eq v5.8.8) {
  eval {
-  require Win32;
+  require ActivePerl;
   1;
  } and do {
-  if (defined &Win32::BuildNumber) {
-   $is_as = 1;
+  if (defined &ActivePerl::BUILD) {
+   my $build = int ActivePerl::BUILD();
+   if ($build >= 822) {
+    $is_as = 1;
+    push @DEFINES, '-DVMG_COMPAT_ARRAY_PUSH_NOLEN=1';
+   }
   }
  }
 }

diff --git a/t/00-load.t b/t/00-load.t
index d130892c33a4392658d88603bac122852dfd469b..7bc69f4e6cbd9fe4b7f5eddd19c4031a3369831d 100644 (file)
--- a/t/00-load.t
+++ b/t/00-load.t
@@ -13,7 +13,6 @@ my $p = Variable::Magic::VMG_PERL_PATCHLEVEL;
 $p = $p ? 'patchlevel ' . $p : 'no patchlevel';
 diag( "Testing Variable::Magic $Variable::Magic::VERSION, Perl $] ($p), $^X" );
 
-if ($^O eq 'MSWin32' && eval { require Win32; 1 }
-                     && defined &Win32::BuildNumber) {
- diag "This is ActiveState Perl $] build " . Win32::BuildNumber();
+if (eval { require ActivePerl; 1 } and defined &ActivePerl::BUILD) {
+ diag "This is ActiveState Perl $] build " . ActivePerl::BUILD();
 }