summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2010-04-08 12:33:19 +0300
committerPanu Matilainen <pmatilai@redhat.com>2010-04-08 12:33:19 +0300
commit72a472bdcd30aa3a76b7b2e4b46bdf0c748e0ffa (patch)
tree279e0c938539764c93af8792b85c7b00792b21d2 /lib
parent946f17a9f8b21ffeda1af9b0925ba5c2752e052e (diff)
downloadrpm-72a472bdcd30aa3a76b7b2e4b46bdf0c748e0ffa.tar.gz
rpm-72a472bdcd30aa3a76b7b2e4b46bdf0c748e0ffa.tar.bz2
rpm-72a472bdcd30aa3a76b7b2e4b46bdf0c748e0ffa.zip
Require BDB >= 4.5 for sanity's sake
- replace unused feature tests in configure.ac with a simple version check
Diffstat (limited to 'lib')
-rw-r--r--lib/backend/db3.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index 549e4cd90..0bb6e18a5 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -68,7 +68,6 @@ static int fsync_disable(int fd)
return 0;
}
-#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 5)
/*
* dbenv->failchk() callback method for determining is the given pid/tid
* is alive. We only care about pid's though.
@@ -88,7 +87,6 @@ static int isalive(DB_ENV *dbenv, pid_t pid, db_threadid_t tid, uint32_t flags)
return alive;
}
-#endif
static int db_init(dbiIndex dbi, const char * dbhome, DB_ENV ** dbenvp)
{
@@ -116,14 +114,12 @@ static int db_init(dbiIndex dbi, const char * dbhome, DB_ENV ** dbenvp)
dbenv->set_errcall(dbenv, NULL);
dbenv->set_errpfx(dbenv, _errpfx);
-#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 5)
/*
* These enable automatic stale lock removal.
* thread_count 8 is some kind of "magic minimum" value...
*/
dbenv->set_thread_count(dbenv, 8);
dbenv->set_isalive(dbenv, isalive);
-#endif
dbenv->set_verbose(dbenv, DB_VERB_DEADLOCK,
(dbi->dbi_verbose & DB_VERB_DEADLOCK));
@@ -152,13 +148,11 @@ static int db_init(dbiIndex dbi, const char * dbhome, DB_ENV ** dbenvp)
if (rc)
goto errxit;
-#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 5)
/* stale lock removal */
rc = dbenv->failchk(dbenv, 0);
rc = cvtdberr(dbi, "dbenv->failchk", rc, _debug);
if (rc)
goto errxit;
-#endif
*dbenvp = dbenv;