summaryrefslogtreecommitdiff
path: root/cpan/DB_File
diff options
context:
space:
mode:
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>2014-12-09 14:50:17 +0000
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>2014-12-09 14:50:17 +0000
commit503436852cd828a270769d86d8f9f50fab0380d1 (patch)
tree7846f2d6ac044ecf866ae6bbce09635f4f223e05 /cpan/DB_File
parentc4c855b90ec42b2452daf44d4d9994afd1613089 (diff)
downloadperl-503436852cd828a270769d86d8f9f50fab0380d1.tar.gz
Update DB_File to CPAN version 1.832
[DELTA] 1.832 8 Dec 2014 * Silence compiler warnings * C++ change from blead
Diffstat (limited to 'cpan/DB_File')
-rw-r--r--cpan/DB_File/DB_File.pm2
-rw-r--r--cpan/DB_File/DB_File.xs21
2 files changed, 22 insertions, 1 deletions
diff --git a/cpan/DB_File/DB_File.pm b/cpan/DB_File/DB_File.pm
index 9a34694501..73fd4e0cf5 100644
--- a/cpan/DB_File/DB_File.pm
+++ b/cpan/DB_File/DB_File.pm
@@ -163,7 +163,7 @@ our ($db_version, $use_XSLoader, $splice_end_array_no_length, $splice_end_array,
use Carp;
-$VERSION = "1.831" ;
+$VERSION = "1.832" ;
$VERSION = eval $VERSION; # needed for dev releases
{
diff --git a/cpan/DB_File/DB_File.xs b/cpan/DB_File/DB_File.xs
index d9317c0ae5..d694695739 100644
--- a/cpan/DB_File/DB_File.xs
+++ b/cpan/DB_File/DB_File.xs
@@ -153,6 +153,10 @@
# include <db.h>
#endif
+#ifndef PERL_UNUSED_ARG
+# define PERL_UNUSED_ARG(x) ((void)x)
+#endif
+
/* Wall starts with 5.7.x */
#if PERL_REVISION > 5 || (PERL_REVISION == 5 && PERL_VERSION >= 7)
@@ -599,6 +603,9 @@ const DBT * key2 ;
int retval ;
int count ;
+#ifdef AT_LEAST_DB_3_2
+ PERL_UNUSED_ARG(db);
+#endif
if (CurrentDB->in_compare) {
tidyUp(CurrentDB);
@@ -684,6 +691,10 @@ const DBT * key2 ;
int retval ;
int count ;
+#ifdef AT_LEAST_DB_3_2
+ PERL_UNUSED_ARG(db);
+#endif
+
if (CurrentDB->in_prefix){
tidyUp(CurrentDB);
croak ("DB_File btree_prefix: recursion detected\n") ;
@@ -773,6 +784,10 @@ HASH_CB_SIZE_TYPE size ;
int retval = 0;
int count ;
+#ifdef AT_LEAST_DB_3_2
+ PERL_UNUSED_ARG(db);
+#endif
+
if (CurrentDB->in_hash){
tidyUp(CurrentDB);
croak ("DB_File hash callback: recursion detected\n") ;
@@ -828,6 +843,9 @@ db_errcall_cb(const char * db_errpfx, char * buffer)
dTHX;
#endif
SV * sv = perl_get_sv(ERR_BUFF, FALSE) ;
+#ifdef AT_LEAST_DB_4_3
+ PERL_UNUSED_ARG(dbenv);
+#endif
if (sv) {
if (db_errpfx)
sv_setpvf(sv, "%s: %s", db_errpfx, buffer) ;
@@ -1528,6 +1546,7 @@ BOOT:
#endif
#ifdef WANT_ERROR
SV * sv_err = perl_get_sv(ERR_BUFF, GV_ADD|GV_ADDMULTI) ;
+ PERL_UNUSED_VAR(sv_err); /* huh? we just retrieved it... */
#endif
MY_CXT_INIT;
__getBerkeleyDBInfo() ;
@@ -1606,6 +1625,7 @@ db_DELETE(db, key, flags=0)
PREINIT:
dMY_CXT;
INIT:
+ (void)flags;
CurrentDB = db ;
@@ -1654,6 +1674,7 @@ db_STORE(db, key, value, flags=0)
PREINIT:
dMY_CXT;
INIT:
+ (void)flags;
CurrentDB = db ;