From f1aa208bc0c532fa882692b00984ea80fa318d82 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Mon, 5 Feb 2007 12:24:24 +0000 Subject: [PATCH] Upgrade to DB_File 1.815 p4raw-id: //depot/perl@30128 --- ext/DB_File/Changes | 8 ++++++++ ext/DB_File/DB_File.pm | 12 ++++++++---- ext/DB_File/DB_File.xs | 5 +++-- ext/DB_File/Makefile.PL | 11 +++++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/ext/DB_File/Changes b/ext/DB_File/Changes index d472ece..44c3930 100644 --- a/ext/DB_File/Changes +++ b/ext/DB_File/Changes @@ -1,5 +1,13 @@ +1.815 4 February 2007 + + * A few casting cleanups for building with C++ from Steve Peters. + + * Fixed problem with recno which happened if you changed directory after + opening the database. Problem reported by Andrew Pam. + + 1.814 11 November 2005 * Fix from Dominic Dunlop to tidy up an OS-X specific warning in diff --git a/ext/DB_File/DB_File.pm b/ext/DB_File/DB_File.pm index 8b5ba4e..beb00b5 100644 --- a/ext/DB_File/DB_File.pm +++ b/ext/DB_File/DB_File.pm @@ -1,10 +1,10 @@ # DB_File.pm -- Perl 5 interface to Berkeley DB # # written by Paul Marquess (pmqs@cpan.org) -# last modified 11th November 2005 -# version 1.814 +# last modified 4th February 2007 +# version 1.815 # -# Copyright (c) 1995-2005 Paul Marquess. All rights reserved. +# Copyright (c) 1995-2007 Paul Marquess. All rights reserved. # This program is free software; you can redistribute it and/or # modify it under the same terms as Perl itself. @@ -165,7 +165,7 @@ our ($db_version, $use_XSLoader, $splice_end_array, $Error); use Carp; -$VERSION = "1.81401" ; +$VERSION = "1.815" ; { local $SIG{__WARN__} = sub {$splice_end_array = "@_";}; @@ -260,6 +260,10 @@ sub tie_hash_or_array my (@arg) = @_ ; my $tieHASH = ( (caller(1))[3] =~ /TIEHASH/ ) ; + use File::Spec; + $arg[1] = File::Spec->rel2abs($arg[1]) + if defined $arg[1] ; + $arg[4] = tied %{ $arg[4] } if @arg >= 5 && ref $arg[4] && $arg[4] =~ /=HASH/ && tied %{ $arg[4] } ; diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs index 7cbe5e8..6e91dda 100644 --- a/ext/DB_File/DB_File.xs +++ b/ext/DB_File/DB_File.xs @@ -3,8 +3,8 @@ DB_File.xs -- Perl 5 interface to Berkeley DB written by Paul Marquess - last modified 11th November 2005 - version 1.814 + last modified 4th February 2007 + version 1.815 All comments/suggestions/problems are welcome @@ -114,6 +114,7 @@ 1.812 - no change 1.813 - no change 1.814 - no change + 1.814 - C++ casting fixes */ diff --git a/ext/DB_File/Makefile.PL b/ext/DB_File/Makefile.PL index 17562b8..d3a595f 100644 --- a/ext/DB_File/Makefile.PL +++ b/ext/DB_File/Makefile.PL @@ -22,6 +22,17 @@ WriteMakefile( XSPROTOARG => '-noprototypes', DEFINE => $OS2 || "", INC => ($^O eq "MacOS" ? "-i ::::db:include" : ""), + ((ExtUtils::MakeMaker->VERSION() gt '6.30') + ? ('LICENSE' => 'perl') + : () + ), + ( + $] >= 5.005 + ? (ABSTRACT_FROM => 'DB_File.pm', + AUTHOR => 'Paul Marquess ') + : () + ), + 'depend' => {'version$(OBJ_EXT)' => 'version.c'}, 'clean' => {FILES => 'constants.h constants.xs'}, ); -- 2.7.4