diff --git a/build/openldap.m4 b/build/openldap.m4 index 060c797c2d727c6f7f81e02804e28313f33a2d6a..9f627b534c441219e48ca5d001873a3af632579e 100644 --- a/build/openldap.m4 +++ b/build/openldap.m4 @@ -628,9 +628,9 @@ main() } #if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1) - rc = env->open( env, NULL, flags, 0 ); + rc = (env->open)( env, NULL, flags, 0 ); #else - rc = env->open( env, NULL, NULL, flags, 0 ); + rc = (env->open)( env, NULL, NULL, flags, 0 ); #endif if ( rc == 0 ) { diff --git a/configure b/configure index 8677b5b13fb172cac181311b0d57b2d48f078c09..c2ef190006f44e4f4ebe783f57aec5d62f46e286 100755 --- a/configure +++ b/configure @@ -31147,9 +31147,9 @@ main() } #if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1) - rc = env->open( env, NULL, flags, 0 ); + rc = (env->open)( env, NULL, flags, 0 ); #else - rc = env->open( env, NULL, NULL, flags, 0 ); + rc = (env->open)( env, NULL, NULL, flags, 0 ); #endif if ( rc == 0 ) { diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h index bf3c6ab825f44ed0ea2e834ae52991329f64c731..85361505793d6c80d410ba996cfbf11e03cf182b 100644 --- a/servers/slapd/back-bdb/back-bdb.h +++ b/servers/slapd/back-bdb/back-bdb.h @@ -239,7 +239,7 @@ struct bdb_op_info { }; #define DB_OPEN(db, file, name, type, flags, mode) \ - (db)->open(db, file, name, type, flags, mode) + ((db)->open)(db, file, name, type, flags, mode) #if DB_VERSION_MAJOR < 4 #define LOCK_DETECT(env,f,t,a) lock_detect(env, f, t, a) @@ -270,7 +270,7 @@ struct bdb_op_info { #if DB_VERSION_FULL >= 0x04010011 #undef DB_OPEN #define DB_OPEN(db, file, name, type, flags, mode) \ - (db)->open(db, NULL, file, name, type, flags, mode) + ((db)->open)(db, NULL, file, name, type, flags, mode) #endif #endif diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c index 4b5f012335680ce0b15eeeceaa1501cfab4fa4db..650813ab0a8b98068d8d8b2697aada7fb480e7b2 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -298,7 +298,7 @@ shm_retry: bdb->bi_dbenv->set_shm_key( bdb->bi_dbenv, bdb->bi_shm_key ); flags |= DB_SYSTEM_MEM; } - rc = bdb->bi_dbenv->open( bdb->bi_dbenv, dbhome, + rc = (bdb->bi_dbenv->open)( bdb->bi_dbenv, dbhome, flags | do_recover, bdb->bi_dbenv_mode ); if ( rc ) {