[prev in list] [next in list] [prev in thread] [next in thread]
List: apr-cvs
Subject: svn commit: r938137 - /apr/apr-util/branches/1.5.x/dbm/apr_dbm_berkeleydb.c
From: trawick () apache ! org
Date: 2010-04-26 17:32:35
Message-ID: 20100426173235.33D3223889BF () eris ! apache ! org
[Download RAW message or body]
Author: trawick
Date: Mon Apr 26 17:32:34 2010
New Revision: 938137
URL: http://svn.apache.org/viewvc?rev=938137&view=rev
Log:
merge r938132 from apr trunk:
Support Berkeley DB 5.0.
PR: 49179
Submitted by: Bernhard Rosenkraenzer <br blankpage.ch>
Modified:
apr/apr-util/branches/1.5.x/dbm/apr_dbm_berkeleydb.c
Modified: apr/apr-util/branches/1.5.x/dbm/apr_dbm_berkeleydb.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/apr_dbm_berkeleydb.c?rev=938137&r1=938136&r2=938137&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/apr_dbm_berkeleydb.c (original)
+++ apr/apr-util/branches/1.5.x/dbm/apr_dbm_berkeleydb.c Mon Apr 26 17:32:34 2010
@@ -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)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic