apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r938146 - in /apr/apr-util/branches/1.3.x: CHANGES dbm/apr_dbm_berkeleydb.c
Date Mon, 26 Apr 2010 17:43:11 GMT
Author: trawick
Date: Mon Apr 26 17:43:11 2010
New Revision: 938146

URL: http://svn.apache.org/viewvc?rev=938146&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.3.x/CHANGES
    apr/apr-util/branches/1.3.x/dbm/apr_dbm_berkeleydb.c

Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=938146&r1=938145&r2=938146&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Mon Apr 26 17:43:11 2010
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.3.10
 
+  *) Add support for Berkeley DB 5.0. [Bernhard Rosenkraenzer
+     <br blankpage.ch>]
+
   *) Add support for Berkeley DB 4.8. [Arfrever Frehtes Taifersar Arahesis
      <arfrever.fta gmail.com>]
   

Modified: apr/apr-util/branches/1.3.x/dbm/apr_dbm_berkeleydb.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbm/apr_dbm_berkeleydb.c?rev=938146&r1=938145&r2=938146&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbm/apr_dbm_berkeleydb.c (original)
+++ apr/apr-util/branches/1.3.x/dbm/apr_dbm_berkeleydb.c Mon Apr 26 17:43:11 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)



Mime
View raw message