From 5ff509f2d39da784895bb6846b473799ab5905d4 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sun, 25 Aug 2002 11:06:35 +0000 Subject: [PATCH] Fix previous commit, BDB_REUSE_LOCKERS was inside a BDB version #ifdef but is not version-dependent. --- servers/slapd/back-bdb/back-bdb.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h index 2d7075b993..18d2ab9419 100644 --- a/servers/slapd/back-bdb/back-bdb.h +++ b/servers/slapd/back-bdb/back-bdb.h @@ -171,6 +171,13 @@ struct bdb_op_info { #define XLOCK_ID(env, locker) (env)->lock_id(env, locker) #define XLOCK_ID_FREE(env, locker) (env)->lock_id_free(env, locker) +/* BDB 4.1.17 adds txn arg to db->open */ +#if DB_VERSION_MINOR > 1 || DB_VERSION_PATCH >= 17 +#undef DB_OPEN +#define DB_OPEN(db, file, name, type, flags, mode) \ + (db)->open(db, NULL, file, name, type, (flags)|DB_AUTO_COMMIT, mode) +#endif + #define BDB_REUSE_LOCKERS #ifdef BDB_REUSE_LOCKERS @@ -181,12 +188,6 @@ struct bdb_op_info { #define LOCK_ID(env, locker) XLOCK_ID(env, locker) #endif -#if DB_VERSION_MINOR > 1 || DB_VERSION_PATCH >= 17 -#undef DB_OPEN -#define DB_OPEN(db, file, name, type, flags, mode) \ - (db)->open(db, NULL, file, name, type, (flags)|DB_AUTO_COMMIT, mode) -#endif - #endif LDAP_END_DECL