summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@gmail.com>2005-03-22 14:03:12 +0000
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>2005-03-22 14:03:12 +0000
commitb04f6d364dc3b26d2309e24417e692690629b145 (patch)
tree04d894cdc82307e45056d5444bd4466152fde502 /lib
parent05fb677a707541c064a1e603c5ed94d6d12db486 (diff)
downloadperl-b04f6d364dc3b26d2309e24417e692690629b145.tar.gz
Upgrade to PathTools 3.05
p4raw-id: //depot/perl@24069
Diffstat (limited to 'lib')
-rw-r--r--lib/Cwd.pm19
-rw-r--r--lib/File/Spec.pm2
2 files changed, 11 insertions, 10 deletions
diff --git a/lib/Cwd.pm b/lib/Cwd.pm
index c389c385d6..002b7c1183 100644
--- a/lib/Cwd.pm
+++ b/lib/Cwd.pm
@@ -170,7 +170,7 @@ use strict;
use Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
-$VERSION = '3.04_01';
+$VERSION = '3.05';
@ISA = qw/ Exporter /;
@EXPORT = qw(cwd getcwd fastcwd fastgetcwd);
@@ -199,15 +199,16 @@ if ($^O eq 'os2') {
return 1;
}
+# If loading the XS stuff doesn't work, we can fall back to pure perl
eval {
-if ( $] >= 5.006 ) {
- require XSLoader;
- XSLoader::load( __PACKAGE__, $VERSION );
-} else {
- require DynaLoader;
- push @ISA, 'DynaLoader';
- __PACKAGE__->bootstrap( $VERSION );
-}
+ if ( $] >= 5.006 ) {
+ require XSLoader;
+ XSLoader::load( __PACKAGE__, $VERSION );
+ } else {
+ require DynaLoader;
+ push @ISA, 'DynaLoader';
+ __PACKAGE__->bootstrap( $VERSION );
+ }
};
# Must be after the DynaLoader stuff:
diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm
index 44771c97eb..e1986a96d6 100644
--- 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.04';
+$VERSION = '3.05';
$VERSION = eval $VERSION;
my %module = (MacOS => 'Mac',