Skip to content
Snippets Groups Projects
Commit 5ff509f2 authored by Howard Chu's avatar Howard Chu
Browse files

Fix previous commit, BDB_REUSE_LOCKERS was inside a BDB version #ifdef

but is not version-dependent.
parent 1524f867
Branches
Tags
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment