Upgrade to PathTools 3.25

p4raw-id: //depot/perl@31382

diff --git a/ext/Cwd/Changes b/ext/Cwd/Changes
index e7b54a7..7558ff5 100644 (file)
--- a/ext/Cwd/Changes
+++ b/ext/Cwd/Changes
@@ -1,5 +1,16 @@
 Revision history for Perl distribution PathTools.
 
+ - Added a workaround for auto-vivication-of-function-args Perl bug
+   (triggered by OS/2-specific code). [Ilya Zakharevich]
+
+ - Sync with a bleadperl change: miniperl can no longer use Win32::*
+   functions because it cannot load Win32.dll. [Jan Dubois]
+
+ - We only need to load ppport.h when building outside the core, so we
+   avoid using it when in the core.
+ 
+3.24 - Sun Nov 19 22:52:49 2006
+
  - Fixed a bug in the $ENV{PWD}-updating of Cwd::chdir() when a
    dirhandle is passed in. [Steve Peters]
 

diff --git a/ext/Cwd/Cwd.xs b/ext/Cwd/Cwd.xs
index 99d372c..7434dfa 100644 (file)
--- a/ext/Cwd/Cwd.xs
+++ b/ext/Cwd/Cwd.xs
@@ -1,7 +1,7 @@
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
-#ifdef USE_PPPORT_H
+#ifndef NO_PPPORT_H
 #   define NEED_sv_2pv_nolen
 #   include "ppport.h"
 #endif

diff --git a/ext/Cwd/Makefile.PL b/ext/Cwd/Makefile.PL
index 02e5a3b..1e9a80d 100644 (file)
--- a/ext/Cwd/Makefile.PL
+++ b/ext/Cwd/Makefile.PL
@@ -1,10 +1,7 @@
+# core-only Makefile.PL
 use ExtUtils::MakeMaker;
 WriteMakefile(
     NAME    => 'Cwd',
     VERSION_FROM => '../../lib/Cwd.pm',
-    (
-        (grep { $_ eq 'PERL_CORE=1' } @ARGV)
-            ? ()
-            : ('DEFINE' => '-DUSE_PPPORT_H')
-    ),
+    'DEFINE' => '-DNO_PPPORT_H',
 );

diff --git a/lib/Cwd.pm b/lib/Cwd.pm
index 7eb0cf5..a4ef00c 100644 (file)
--- a/lib/Cwd.pm
+++ b/lib/Cwd.pm
@@ -171,7 +171,7 @@ use strict;
 use Exporter;
 use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
 
-$VERSION = '3.24_01';
+$VERSION = '3.25';
 
 @ISA = qw/ Exporter /;
 @EXPORT = qw(cwd getcwd fastcwd fastgetcwd);

diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm
index 28379ab..365c0c5 100644 (file)
--- a/lib/File/Spec.pm
+++ b/lib/File/Spec.pm
@@ -3,7 +3,7 @@ package File::Spec;
 use strict;
 use vars qw(@ISA $VERSION);
 
-$VERSION = '3.24';
+$VERSION = '3.25';
 $VERSION = eval $VERSION;
 
 my %module = (MacOS   => 'Mac',

diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm
index ec308f3..c7fa33c 100644 (file)
--- a/lib/File/Spec/OS2.pm
+++ b/lib/File/Spec/OS2.pm
@@ -37,9 +37,8 @@ sub _cwd {
 my $tmpdir;
 sub tmpdir {
     return $tmpdir if defined $tmpdir;
-    $tmpdir = $_[0]->_tmpdir( @ENV{qw(TMPDIR TEMP TMP)},
-                             '/tmp',
-                             '/'  );
+    my @d = @ENV{qw(TMPDIR TEMP TMP)}; # function call could autovivivy
+    $tmpdir = $_[0]->_tmpdir( @d, '/tmp', '/'  );
 }
 
 sub catdir {

diff --git a/lib/File/Spec/t/tmpdir.t b/lib/File/Spec/t/tmpdir.t
index cffa0b0..4acbdf0 100644 (file)
--- a/lib/File/Spec/t/tmpdir.t
+++ b/lib/File/Spec/t/tmpdir.t
@@ -5,7 +5,7 @@ use Test;
 use File::Spec;
 use File::Spec::Win32;
 
-plan tests => 3;
+plan tests => 4;
 
 ok 1, 1, "Loaded";
 
@@ -13,5 +13,11 @@ my $num_keys = keys %ENV;
 File::Spec->tmpdir;
 ok scalar keys %ENV, $num_keys, "tmpdir() shouldn't change the contents of %ENV";
 
+{
+  local %ENV;
+  File::Spec::Win32->tmpdir;
+  ok scalar keys %ENV, 0, "Win32->tmpdir() shouldn't change the contents of %ENV";
+}
+
 File::Spec::Win32->tmpdir;
 ok scalar keys %ENV, $num_keys, "Win32->tmpdir() shouldn't change the contents of %ENV";