From: Paul Marquess <paul.marquess@btinternet.com>
Date: Fri, 11 Nov 2005 12:09:55 +0000 (+0000)
Subject: DB_File 1.814
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c36891e2b793724fb2ed51a8f18767adf94572cf;p=p5sagit%2Fp5-mst-13.2.git

DB_File 1.814
Message-ID: <00e301c5e6b8$d5a357f0$241c140a@myopwv.com>

p4raw-id: //depot/perl@26088
---

diff --git a/ext/DB_File/Changes b/ext/DB_File/Changes
index e5f1c32..d472ece 100644
--- a/ext/DB_File/Changes
+++ b/ext/DB_File/Changes
@@ -1,5 +1,13 @@
 
 
+1.814 11 November 2005
+
+   * Fix from Dominic Dunlop to tidy up an OS-X specific warning in
+     db-btree.t.
+
+   * Silenced a warning about $DB_File::Error only being used once.
+     Issue spotted by Dominic Dunlop.
+
 1.813 31st October 2005
 
    * Updates for Berkeley DB 4.4
diff --git a/ext/DB_File/DB_File.pm b/ext/DB_File/DB_File.pm
index ccaf44f..3bdaded 100644
--- a/ext/DB_File/DB_File.pm
+++ b/ext/DB_File/DB_File.pm
@@ -1,8 +1,8 @@
 # DB_File.pm -- Perl 5 interface to Berkeley DB 
 #
 # written by Paul Marquess (pmqs@cpan.org)
-# last modified 31st October 2005
-# version 1.813
+# last modified 11th November 2005
+# version 1.814
 #
 #     Copyright (c) 1995-2005 Paul Marquess. All rights reserved.
 #     This program is free software; you can redistribute it and/or
@@ -161,11 +161,11 @@ package DB_File ;
 use warnings;
 use strict;
 our ($VERSION, @ISA, @EXPORT, $AUTOLOAD, $DB_BTREE, $DB_HASH, $DB_RECNO);
-our ($db_version, $use_XSLoader, $splice_end_array);
+our ($db_version, $use_XSLoader, $splice_end_array, $Error);
 use Carp;
 
 
-$VERSION = "1.813" ;
+$VERSION = "1.814" ;
 
 {
     local $SIG{__WARN__} = sub {$splice_end_array = "@_";};
diff --git a/ext/DB_File/DB_File.xs b/ext/DB_File/DB_File.xs
index 5b36ae6..8f4cb2f 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 <pmqs@cpan.org>
- last modified 31st October 2005
- version 1.813
+ last modified 11th November 2005
+ version 1.814
 
  All comments/suggestions/problems are welcome
 
@@ -113,6 +113,7 @@
         1.811 - no change
         1.812 - no change
         1.813 - no change
+        1.814 - no change
 
 */
 
diff --git a/ext/DB_File/t/db-btree.t b/ext/DB_File/t/db-btree.t
index 1a7879b..cb5ff43 100755
--- a/ext/DB_File/t/db-btree.t
+++ b/ext/DB_File/t/db-btree.t
@@ -23,6 +23,7 @@ BEGIN {
 BEGIN
 {
     if ($^O eq 'darwin'
+	&& (split(/\./, $Config{osvers}))[0] < 7 # Mac OS X 10.3 == Darwin 7
 	&& $Config{db_version_major} == 1
 	&& $Config{db_version_minor} == 0
 	&& $Config{db_version_patch} == 0) {