summaryrefslogtreecommitdiff
path: root/dbm
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2010-04-26 17:25:16 +0000
committerJeff Trawick <trawick@apache.org>2010-04-26 17:25:16 +0000
commit297d17e4ea4b4331ece32660e5589fa47d9ba9e0 (patch)
treef23f33da11b992b7609461a41e227a635405b951 /dbm
parent61f5d3767e65c656696efe65f9b46a4a8fd9b3b8 (diff)
downloadapr-297d17e4ea4b4331ece32660e5589fa47d9ba9e0.tar.gz
Support Berkeley DB 5.0.
PR: 49179 Submitted by: Bernhard Rosenkraenzer <br blankpage.ch> git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@938132 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbm')
-rw-r--r--dbm/apr_dbm_berkeleydb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dbm/apr_dbm_berkeleydb.c b/dbm/apr_dbm_berkeleydb.c
index 838e373bd..37e36bd22 100644
--- a/dbm/apr_dbm_berkeleydb.c
+++ b/dbm/apr_dbm_berkeleydb.c
@@ -37,13 +37,13 @@
* DB_185, DB2, DB3, and DB4.
*/
-#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
+#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR >= 4)
/* We will treat anything greater than 4.1 as DB4.
* We can treat 4.0 as DB3.
*/
-#if defined(DB_VERSION_MINOR) && (DB_VERSION_MINOR >= 1)
+#if DB_VERSION_MAJOR > 4 || (defined(DB_VERSION_MINOR) && (DB_VERSION_MINOR >= 1))
#define DB_VER 4
-#else
+#elif DB_VERSION_MAJOR == 4
#define DB_VER 3
#endif
#elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 3)