With Win32 now building DynaLoader in ext, no need for the XSUBPP macro.

[p5sagit/p5-mst-13.2.git] / win32 / config_sh.PL

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 5bd9953..699cd7d 100644 (file)
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -42,8 +42,8 @@ while (@{$optref} && $optref->[0] =~ /^([\w_]+)=(.*)$/) {
     shift(@{$optref});
 }
 
+FindExt::scan_ext("../cpan");
 FindExt::scan_ext("../ext");
-FindExt::scan_ext("ext") if -d 'ext';  # also look in win32/ext/ if it exists
 FindExt::set_static_extensions(split ' ', $opt{'static_ext'});
 
 $opt{'nonxs_ext'}        = join(' ',FindExt::nonxs_ext()) || ' ';
@@ -131,17 +131,14 @@ if ($opt{uselargefiles} eq 'define' and $opt{cc} ne 'bcc32') {
     }
 }
 
-# change the sGMTIME_min and sGMTIME_max for VS2005 (aka VC 8) and
+# change the s{GM|LOCAL}TIME_{min|max} for VS2005 (aka VC 8) and
 # VS2008 (aka VC 9) or higher (presuming that later versions will have
 # at least the range of that).
 if ($opt{cc} eq 'cl' and $opt{ccversion} =~ /^(\d+)/) {
     my $ccversion = $1;
-    if ($ccversion == 14) {
-       $opt{sGMTIME_max} = 32535244799;
-    }
-    elsif ($ccversion >= 15) {
-       $opt{sGMTIME_min} = -43200;
+    if ($ccversion >= 14) {
        $opt{sGMTIME_max} = 32535291599;
+       $opt{sLOCALTIME_max} = 32535244799;
     }
 }