--- db-4.7.25/build_vxworks/db_archive/db_archive.c
+++ db-4.7.25/build_vxworks/db_archive/db_archive.c
@@ -134,9 +134,9 @@ db_archive_main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home, DB_CREATE |
+	    (ret = (dbenv->open)(dbenv, home, DB_CREATE |
 	    DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
--- db-4.7.25/build_vxworks/db_checkpoint/db_checkpoint.c
+++ db-4.7.25/build_vxworks/db_checkpoint/db_checkpoint.c
@@ -156,9 +156,9 @@ db_checkpoint_main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (!once || ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
--- db-4.7.25/build_vxworks/db_deadlock/db_deadlock.c
+++ db-4.7.25/build_vxworks/db_deadlock/db_deadlock.c
@@ -172,7 +172,7 @@ db_deadlock_main(argc, argv)
 	}
 
 	/* An environment is required. */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0) {
 		dbenv->err(dbenv, ret, "open");
 		goto shutdown;
 	}
--- db-4.7.25/build_vxworks/db_dump/db_dump.c
+++ db-4.7.25/build_vxworks/db_dump/db_dump.c
@@ -214,7 +214,7 @@ retry:	if ((ret = db_env_create(&dbenv, 0)) != 0) {
 		goto done;
 	}
 
-	if ((ret = dbp->open(dbp, NULL,
+	if ((ret = (dbp->open)(dbp, NULL,
 	    argv[0], subname, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
 		dbp->err(dbp, ret, "open: %s", argv[0]);
 		goto err;
@@ -311,7 +311,7 @@ db_dump_db_init(dbenv, home, is_salvage, cache, is_privatep)
 	 * before we create our own.
 	 */
 	*is_privatep = 0;
-	if ((ret = dbenv->open(dbenv, home,
+	if ((ret = (dbenv->open)(dbenv, home,
 	    DB_USE_ENVIRON | (is_salvage ? DB_INIT_MPOOL : 0), 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
@@ -329,7 +329,7 @@ db_dump_db_init(dbenv, home, is_salvage, cache, is_privatep)
 	 */
 	*is_privatep = 1;
 	if ((ret = dbenv->set_cachesize(dbenv, 0, cache, 1)) == 0 &&
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) == 0)
 		return (0);
 
@@ -382,7 +382,7 @@ db_dump_dump_sub(dbenv, parent_dbp, parent_name, pflag, keyflag)
 			free(subdb);
 			return (1);
 		}
-		if ((ret = dbp->open(dbp, NULL,
+		if ((ret = (dbp->open)(dbp, NULL,
 		    parent_name, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0)
 			dbp->err(dbp, ret,
 			    "DB->open: %s:%s", parent_name, subdb);
--- db-4.7.25/build_vxworks/db_hotbackup/db_hotbackup.c
+++ db-4.7.25/build_vxworks/db_hotbackup/db_hotbackup.c
@@ -439,9 +439,9 @@ db_hotbackup_env_init(dbenvp, home, log_dirp, data_dirp, passwd, which)
 		 * We try to attach to a pre-existing environment; if that
 		 * fails, we create a private environment and try again.
 		 */
-		if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+		if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 		    (ret == DB_VERSION_MISMATCH ||
-		    (ret = dbenv->open(dbenv, home, DB_CREATE |
+		    (ret = (dbenv->open)(dbenv, home, DB_CREATE |
 		    DB_INIT_LOG | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON,
 		    0)) != 0)) {
 			dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
@@ -466,7 +466,7 @@ db_hotbackup_env_init(dbenvp, home, log_dirp, data_dirp, passwd, which)
 			     ret, "DB_ENV->set_cachesize: %s", home);
 			return (1);
 		}
-		if ((ret = dbenv->open(dbenv, home, DB_CREATE |
+		if ((ret = (dbenv->open)(dbenv, home, DB_CREATE |
 		    DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_PRIVATE |
 		    DB_RECOVER_FATAL | DB_USE_ENVIRON, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
--- db-4.7.25/build_vxworks/db_load/db_load.c
+++ db-4.7.25/build_vxworks/db_load/db_load.c
@@ -409,7 +409,7 @@ retry_db:
 #endif
 
 	/* Open the DB file. */
-	if ((ret = dbp->open(dbp, NULL, name, subdb, dbtype,
+	if ((ret = (dbp->open)(dbp, NULL, name, subdb, dbtype,
 	    DB_CREATE | (TXN_ON(dbenv->env) ? DB_AUTO_COMMIT : 0),
 	    DB_MODE_666)) != 0) {
 		dbp->err(dbp, ret, "DB->open: %s", name);
@@ -621,7 +621,7 @@ db_load_db_init(dbenv, home, cache, is_private)
 	/* We may be loading into a live environment.  Try and join. */
 	flags = DB_USE_ENVIRON |
 	    DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN;
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
 		goto err;
@@ -645,7 +645,7 @@ db_load_db_init(dbenv, home, cache, is_private)
 		dbenv->err(dbenv, ret, "set_cachesize");
 		return (1);
 	}
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0)
 		return (0);
 
 	/* An environment is required. */
--- db-4.7.25/build_vxworks/db_printlog/db_printlog.c
+++ db-4.7.25/build_vxworks/db_printlog/db_printlog.c
@@ -185,18 +185,18 @@ db_printlog_main(argc, argv)
 	 * with logging, because we don't want to log the opens.
 	 */
 	if (repflag) {
-		if ((ret = dbenv->open(dbenv, home,
+		if ((ret = (dbenv->open)(dbenv, home,
 		    DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0 &&
 		    (ret == DB_VERSION_MISMATCH ||
-		    (ret = dbenv->open(dbenv, home,
+		    (ret = (dbenv->open)(dbenv, home,
 		    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0))
 		    != 0)) {
 			dbenv->err(dbenv, ret, "DB_ENV->open");
 			goto shutdown;
 		}
-	} else if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	} else if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
--- db-4.7.25/build_vxworks/db_recover/db_recover.c
+++ db-4.7.25/build_vxworks/db_recover/db_recover.c
@@ -153,7 +153,7 @@ db_recover_main(argc, argv)
 	    DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON);
 	LF_SET(fatal_recover ? DB_RECOVER_FATAL : DB_RECOVER);
 	LF_SET(retain_env ? DB_INIT_LOCK : DB_PRIVATE);
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
 	}
--- db-4.7.25/build_vxworks/db_stat/db_stat.c
+++ db-4.7.25/build_vxworks/db_stat/db_stat.c
@@ -297,9 +297,9 @@ retry:	if ((ret = db_env_create(&dbenv, 0)) != 0) {
 		 * hash databases for which we don't know the hash function).
 		 */
 		dbenv->set_errfile(dbenv, NULL);
-		ret = dbp->open(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0);
+		ret = (dbp->open)(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0);
 		dbenv->set_errfile(dbenv, stderr);
-		if (ret != 0 && (ret = dbp->open(
+		if (ret != 0 && (ret = (dbp->open)(
 		    dbp, NULL, db, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB->open: %s", db);
 			goto err;
@@ -407,7 +407,7 @@ db_stat_db_init(dbenv, home, ttype, cache, is_private)
 	 * error, I think.
 	 */
 	*is_private = 0;
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
 		goto err;
@@ -437,7 +437,7 @@ db_stat_db_init(dbenv, home, ttype, cache, is_private)
 		oflags |= DB_INIT_MPOOL;
 	if (ttype == T_LOG)
 		oflags |= DB_INIT_LOG;
-	if ((ret = dbenv->open(dbenv, home, oflags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, oflags, 0)) == 0)
 		return (0);
 
 	/* An environment is required. */
--- db-4.7.25/build_vxworks/db_upgrade/db_upgrade.c
+++ db-4.7.25/build_vxworks/db_upgrade/db_upgrade.c
@@ -134,9 +134,9 @@ db_upgrade_main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON,
 	    0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
--- db-4.7.25/build_vxworks/db_verify/db_verify.c
+++ db-4.7.25/build_vxworks/db_verify/db_verify.c
@@ -152,7 +152,7 @@ retry:	if ((ret = db_env_create(&dbenv, 0)) != 0) {
 				goto shutdown;
 			}
 			private = 1;
-			ret = dbenv->open(dbenv, home, DB_CREATE |
+			ret = (dbenv->open)(dbenv, home, DB_CREATE |
 			    DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0);
 		}
 		if (ret != 0) {
@@ -201,7 +201,7 @@ retry:	if ((ret = db_env_create(&dbenv, 0)) != 0) {
 				goto shutdown;
 			}
 
-			ret = dbp1->open(dbp1,
+			ret = (dbp1->open)(dbp1,
 			    NULL, argv[0], NULL, DB_UNKNOWN, DB_RDONLY, 0);
 
 			/*
--- db-4.7.25/build_vxworks/dbdemo/dbdemo.c
+++ db-4.7.25/build_vxworks/dbdemo/dbdemo.c
@@ -90,7 +90,7 @@ dbdemo_main(argc, argv)
 		dbp->err(dbp, ret, "set_cachesize");
 		goto err1;
 	}
-	if ((ret = dbp->open(dbp,
+	if ((ret = (dbp->open)(dbp,
 	    NULL, database, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
 		dbp->err(dbp, ret, "%s: open", database);
 		goto err1;
--- db-4.7.25/db185/db185.c
+++ db-4.7.25/db185/db185.c
@@ -227,7 +227,7 @@ __db185_open(file, oflags, mode, type, openinfo)
 	dbp->api_internal = db185p;
 
 	/* Open the database. */
-	if ((ret = dbp->open(dbp, NULL,
+	if ((ret = (dbp->open)(dbp, NULL,
 	    file, NULL, type, __db_openflags(oflags), mode)) != 0)
 		goto err;
 
--- db-4.7.25/db_archive/db_archive.c
+++ db-4.7.25/db_archive/db_archive.c
@@ -119,9 +119,9 @@ main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home, DB_CREATE |
+	    (ret = (dbenv->open)(dbenv, home, DB_CREATE |
 	    DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
--- db-4.7.25/db_checkpoint/db_checkpoint.c
+++ db-4.7.25/db_checkpoint/db_checkpoint.c
@@ -141,9 +141,9 @@ main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (!once || ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
--- db-4.7.25/db_codegen/code_capi.c
+++ db-4.7.25/db_codegen/code_capi.c
@@ -368,7 +368,7 @@ static int\nbdb_env_startup(env_list_t *ep)\n{\n\
 \tif (ep->transaction)\n\
 \t	open_flags |= DB_INIT_LOCK |\n\
 \t	    DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER;\n\
-\tif ((ret = dbenv->open(dbenv, ep->home, open_flags, 0)) != 0) {\n\
+\tif ((ret = (dbenv->open)(dbenv, ep->home, open_flags, 0)) != 0) {\n\
 \t	dbenv->err(dbenv, ret, \"DB_ENV->open: %%s\",  ep->home);\n\
 \t	goto err;\n\
 \t}\n\
@@ -487,7 +487,7 @@ api_c_db()
 
 	fprintf(of, "\
 \n\
-\tif ((ret = dbp->open(dbp, NULL, dp->name, NULL, dp->type,\n\
+\tif ((ret = (dbp->open)(dbp, NULL, dp->name, NULL, dp->type,\n\
 \t    (dp->transaction ? DB_AUTO_COMMIT : 0) |\n\
 \t    DB_CREATE | DB_THREAD, 0)) != 0) {\n\
 \t\tdbp->err(dbp, ret, \"DB->open: %%s\", dp->name);\n\
--- db-4.7.25/db_deadlock/db_deadlock.c
+++ db-4.7.25/db_deadlock/db_deadlock.c
@@ -157,7 +157,7 @@ main(argc, argv)
 	}
 
 	/* An environment is required. */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0) {
 		dbenv->err(dbenv, ret, "open");
 		goto shutdown;
 	}
--- db-4.7.25/db_dump/db_dump.c
+++ db-4.7.25/db_dump/db_dump.c
@@ -199,7 +199,7 @@ retry:	if ((ret = db_env_create(&dbenv, 0)) != 0) {
 		goto done;
 	}
 
-	if ((ret = dbp->open(dbp, NULL,
+	if ((ret = (dbp->open)(dbp, NULL,
 	    argv[0], subname, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
 		dbp->err(dbp, ret, "open: %s", argv[0]);
 		goto err;
@@ -296,7 +296,7 @@ db_init(dbenv, home, is_salvage, cache, is_privatep)
 	 * before we create our own.
 	 */
 	*is_privatep = 0;
-	if ((ret = dbenv->open(dbenv, home,
+	if ((ret = (dbenv->open)(dbenv, home,
 	    DB_USE_ENVIRON | (is_salvage ? DB_INIT_MPOOL : 0), 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
@@ -314,7 +314,7 @@ db_init(dbenv, home, is_salvage, cache, is_privatep)
 	 */
 	*is_privatep = 1;
 	if ((ret = dbenv->set_cachesize(dbenv, 0, cache, 1)) == 0 &&
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) == 0)
 		return (0);
 
@@ -367,7 +367,7 @@ dump_sub(dbenv, parent_dbp, parent_name, pflag, keyflag)
 			free(subdb);
 			return (1);
 		}
-		if ((ret = dbp->open(dbp, NULL,
+		if ((ret = (dbp->open)(dbp, NULL,
 		    parent_name, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0)
 			dbp->err(dbp, ret,
 			    "DB->open: %s:%s", parent_name, subdb);
--- db-4.7.25/db_hotbackup/db_hotbackup.c
+++ db-4.7.25/db_hotbackup/db_hotbackup.c
@@ -424,9 +424,9 @@ env_init(dbenvp, home, log_dirp, data_dirp, passwd, which)
 		 * We try to attach to a pre-existing environment; if that
 		 * fails, we create a private environment and try again.
 		 */
-		if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+		if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 		    (ret == DB_VERSION_MISMATCH ||
-		    (ret = dbenv->open(dbenv, home, DB_CREATE |
+		    (ret = (dbenv->open)(dbenv, home, DB_CREATE |
 		    DB_INIT_LOG | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON,
 		    0)) != 0)) {
 			dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
@@ -451,7 +451,7 @@ env_init(dbenvp, home, log_dirp, data_dirp, passwd, which)
 			     ret, "DB_ENV->set_cachesize: %s", home);
 			return (1);
 		}
-		if ((ret = dbenv->open(dbenv, home, DB_CREATE |
+		if ((ret = (dbenv->open)(dbenv, home, DB_CREATE |
 		    DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_PRIVATE |
 		    DB_RECOVER_FATAL | DB_USE_ENVIRON, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
--- db-4.7.25/db_load/db_load.c
+++ db-4.7.25/db_load/db_load.c
@@ -394,7 +394,7 @@ retry_db:
 #endif
 
 	/* Open the DB file. */
-	if ((ret = dbp->open(dbp, NULL, name, subdb, dbtype,
+	if ((ret = (dbp->open)(dbp, NULL, name, subdb, dbtype,
 	    DB_CREATE | (TXN_ON(dbenv->env) ? DB_AUTO_COMMIT : 0),
 	    DB_MODE_666)) != 0) {
 		dbp->err(dbp, ret, "DB->open: %s", name);
@@ -606,7 +606,7 @@ db_init(dbenv, home, cache, is_private)
 	/* We may be loading into a live environment.  Try and join. */
 	flags = DB_USE_ENVIRON |
 	    DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN;
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
 		goto err;
@@ -630,7 +630,7 @@ db_init(dbenv, home, cache, is_private)
 		dbenv->err(dbenv, ret, "set_cachesize");
 		return (1);
 	}
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0)
 		return (0);
 
 	/* An environment is required. */
--- db-4.7.25/db_printlog/db_printlog.c
+++ db-4.7.25/db_printlog/db_printlog.c
@@ -170,18 +170,18 @@ main(argc, argv)
 	 * with logging, because we don't want to log the opens.
 	 */
 	if (repflag) {
-		if ((ret = dbenv->open(dbenv, home,
+		if ((ret = (dbenv->open)(dbenv, home,
 		    DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0 &&
 		    (ret == DB_VERSION_MISMATCH ||
-		    (ret = dbenv->open(dbenv, home,
+		    (ret = (dbenv->open)(dbenv, home,
 		    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0))
 		    != 0)) {
 			dbenv->err(dbenv, ret, "DB_ENV->open");
 			goto shutdown;
 		}
-	} else if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	} else if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
--- db-4.7.25/db_recover/db_recover.c
+++ db-4.7.25/db_recover/db_recover.c
@@ -138,7 +138,7 @@ main(argc, argv)
 	    DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON);
 	LF_SET(fatal_recover ? DB_RECOVER_FATAL : DB_RECOVER);
 	LF_SET(retain_env ? DB_INIT_LOCK : DB_PRIVATE);
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto shutdown;
 	}
--- db-4.7.25/db_stat/db_stat.c
+++ db-4.7.25/db_stat/db_stat.c
@@ -282,9 +282,9 @@ retry:	if ((ret = db_env_create(&dbenv, 0)) != 0) {
 		 * hash databases for which we don't know the hash function).
 		 */
 		dbenv->set_errfile(dbenv, NULL);
-		ret = dbp->open(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0);
+		ret = (dbp->open)(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0);
 		dbenv->set_errfile(dbenv, stderr);
-		if (ret != 0 && (ret = dbp->open(
+		if (ret != 0 && (ret = (dbp->open)(
 		    dbp, NULL, db, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB->open: %s", db);
 			goto err;
@@ -392,7 +392,7 @@ db_init(dbenv, home, ttype, cache, is_private)
 	 * error, I think.
 	 */
 	*is_private = 0;
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) == 0)
 		return (0);
 	if (ret == DB_VERSION_MISMATCH)
 		goto err;
@@ -422,7 +422,7 @@ db_init(dbenv, home, ttype, cache, is_private)
 		oflags |= DB_INIT_MPOOL;
 	if (ttype == T_LOG)
 		oflags |= DB_INIT_LOG;
-	if ((ret = dbenv->open(dbenv, home, oflags, 0)) == 0)
+	if ((ret = (dbenv->open)(dbenv, home, oflags, 0)) == 0)
 		return (0);
 
 	/* An environment is required. */
--- db-4.7.25/db_upgrade/db_upgrade.c
+++ db-4.7.25/db_upgrade/db_upgrade.c
@@ -119,9 +119,9 @@ main(argc, argv)
 	 * If attaching to a pre-existing environment fails, create a
 	 * private one and try again.
 	 */
-	if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+	if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
 	    (ret == DB_VERSION_MISMATCH ||
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON,
 	    0)) != 0)) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
--- db-4.7.25/db_verify/db_verify.c
+++ db-4.7.25/db_verify/db_verify.c
@@ -137,7 +137,7 @@ retry:	if ((ret = db_env_create(&dbenv, 0)) != 0) {
 				goto shutdown;
 			}
 			private = 1;
-			ret = dbenv->open(dbenv, home, DB_CREATE |
+			ret = (dbenv->open)(dbenv, home, DB_CREATE |
 			    DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0);
 		}
 		if (ret != 0) {
@@ -186,7 +186,7 @@ retry:	if ((ret = db_env_create(&dbenv, 0)) != 0) {
 				goto shutdown;
 			}
 
-			ret = dbp1->open(dbp1,
+			ret = (dbp1->open)(dbp1,
 			    NULL, argv[0], NULL, DB_UNKNOWN, DB_RDONLY, 0);
 
 			/*
--- db-4.7.25/dbm/dbm.c
+++ db-4.7.25/dbm/dbm.c
@@ -229,7 +229,7 @@ __db_ndbm_open(file, oflags, mode)
 	if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 ||
 	    (ret = dbp->set_h_ffactor(dbp, 40)) != 0 ||
 	    (ret = dbp->set_h_nelem(dbp, 1)) != 0 ||
-	    (ret = dbp->open(dbp, NULL,
+	    (ret = (dbp->open)(dbp, NULL,
 	    path, NULL, DB_HASH, __db_openflags(oflags), mode)) != 0) {
 		__os_set_errno(ret);
 		return (NULL);
--- db-4.7.25/examples_c/bench_001.c
+++ db-4.7.25/examples_c/bench_001.c
@@ -80,7 +80,7 @@ db_init(home, prefix, cachesize, txn)
 	flags = DB_CREATE | DB_INIT_MPOOL;
 	if (txn)
 		flags |= DB_INIT_TXN | DB_INIT_LOCK;
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
 		(void)dbenv->close(dbenv, 0);
 		return (NULL);
@@ -352,7 +352,7 @@ main(argc, argv)
 		if ((ret = dbenv->txn_begin(dbenv, NULL, &txnp, 0)) != 0)
 			goto err;
 
-	if ((ret = dbp->open(
+	if ((ret = (dbp->open)(
 	    dbp, txnp, DATABASE, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
 		dbp->err(dbp, ret, "%s: open", DATABASE);
 		if (txnp != NULL)
--- db-4.7.25/examples_c/csv/db.c
+++ db-4.7.25/examples_c/csv/db.c
@@ -52,9 +52,9 @@ csv_env_open(const char *home, int is_rdonly)
 	 * If that fails, create a new database environment; for now, we only
 	 * need a cache, no logging, locking, or transactions.
 	 */
-	if ((ret = dbenv->open(dbenv, home,
+	if ((ret = (dbenv->open)(dbenv, home,
 	    DB_JOINENV | DB_USE_ENVIRON, 0)) != 0 &&
-	    (ret = dbenv->open(dbenv, home,
+	    (ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		return (1);
@@ -86,7 +86,7 @@ csv_env_open(const char *home, int is_rdonly)
 	}
 
 	/* Open the primary database. */
-	if ((ret = db->open(db, NULL,
+	if ((ret = (db->open)(db, NULL,
 	    "primary", NULL, DB_BTREE, is_rdonly ? 0 : DB_CREATE, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB->open: primary");
 		return (1);
@@ -192,7 +192,7 @@ csv_secondary_open()
 			return (1);
 		}
 
-		if ((ret = sdb->open(
+		if ((ret = (sdb->open)(
 		    sdb, NULL, f->name, NULL, DB_BTREE, DB_CREATE, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB->open: %s", f->name);
 			return (1);
--- db-4.7.25/examples_c/ex_access.c
+++ db-4.7.25/examples_c/ex_access.c
@@ -74,7 +74,7 @@ main(argc, argv)
 		dbp->err(dbp, ret, "set_cachesize");
 		goto err1;
 	}
-	if ((ret = dbp->open(dbp,
+	if ((ret = (dbp->open)(dbp,
 	    NULL, database, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
 		dbp->err(dbp, ret, "%s: open", database);
 		goto err1;
--- db-4.7.25/examples_c/ex_btrec.c
+++ db-4.7.25/examples_c/ex_btrec.c
@@ -67,7 +67,7 @@ ex_btrec()
 		dbp->err(dbp, ret, "set_flags: DB_RECNUM");
 		return (1);
 	}
-	if ((ret = dbp->open(dbp,
+	if ((ret = (dbp->open)(dbp,
 	    NULL, DATABASE, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
 		dbp->err(dbp, ret, "open: %s", DATABASE);
 		return (1);
--- db-4.7.25/examples_c/ex_dbclient.c
+++ db-4.7.25/examples_c/ex_dbclient.c
@@ -120,7 +120,7 @@ loop:
 	 * we need concurrency control and a shared buffer pool, but
 	 * not logging or transactions.
 	 */
-	if ((ret = dbenv->open(dbenv, home,
+	if ((ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_LOCK | DB_INIT_MPOOL, 0)) != 0) {
 		dbenv->err(dbenv, ret, "environment open: %s", home);
 		dbenv->close(dbenv, 0);
@@ -165,7 +165,7 @@ db_clientrun(dbenv, progname)
 		dbp->err(dbp, ret, "set_pagesize");
 		goto err1;
 	}
-	if ((ret = dbp->open(dbp,
+	if ((ret = (dbp->open)(dbp,
 	    NULL, DATABASE, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
 		dbp->err(dbp, ret, "%s: open", DATABASE);
 		goto err1;
--- db-4.7.25/examples_c/ex_env.c
+++ db-4.7.25/examples_c/ex_env.c
@@ -91,7 +91,7 @@ db_setup(home, data_dir, errfp, progname)
 	(void)dbenv->set_data_dir(dbenv, data_dir);
 
 	/* Open the environment with full transactional support. */
-	if ((ret = dbenv->open(dbenv, home,
+	if ((ret = (dbenv->open)(dbenv, home,
     DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN,
 	    0)) != 0) {
 		dbenv->err(dbenv, ret, "environment open: %s", home);
--- db-4.7.25/examples_c/ex_mpool.c
+++ db-4.7.25/examples_c/ex_mpool.c
@@ -194,7 +194,7 @@ run(hits, cachesize, pagesize, npages, progname)
 	}
 
 	/* Open the environment. */
-	if ((ret = dbenv->open(
+	if ((ret = (dbenv->open)(
 	    dbenv, NULL, DB_CREATE | DB_INIT_MPOOL, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB_ENV->open");
 		goto err;
@@ -205,7 +205,7 @@ run(hits, cachesize, pagesize, npages, progname)
 		dbenv->err(dbenv, ret, "DB_ENV->memp_fcreate: %s", MPOOL);
 		goto err;
 	}
-	if ((ret = mfp->open(mfp, MPOOL, 0, 0, pagesize)) != 0) {
+	if ((ret = (mfp->open)(mfp, MPOOL, 0, 0, pagesize)) != 0) {
 		dbenv->err(dbenv, ret, "DB_MPOOLFILE->open: %s", MPOOL);
 		goto err;
 	}
--- db-4.7.25/examples_c/ex_rep/common/rep_common.c
+++ db-4.7.25/examples_c/ex_rep/common/rep_common.c
@@ -134,7 +134,7 @@ doloop(dbenv, shared_data)
 			flags = DB_AUTO_COMMIT;
 			if (shared_data->is_master)
 				flags |= DB_CREATE;
-			if ((ret = dbp->open(dbp,
+			if ((ret = (dbp->open)(dbp,
 			    NULL, DATABASE, NULL, DB_BTREE, flags, 0)) != 0) {
 				if (ret == ENOENT) {
 					printf(
@@ -228,7 +228,7 @@ env_init(dbenv, home)
 
 	flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
 	    DB_INIT_REP | DB_INIT_TXN | DB_RECOVER | DB_THREAD;
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0)
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0)
 		dbenv->err(dbenv, ret, "can't open environment");
 	return (ret);
 }
--- db-4.7.25/examples_c/ex_sequence.c
+++ db-4.7.25/examples_c/ex_sequence.c
@@ -70,7 +70,7 @@ main(argc, argv)
 	}
 	dbp->set_errfile(dbp, stderr);
 	dbp->set_errpfx(dbp, progname);
-	if ((ret = dbp->open(dbp,
+	if ((ret = (dbp->open)(dbp,
 	    NULL, database, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
 		dbp->err(dbp, ret, "%s: open", database);
 		goto err;
@@ -85,7 +85,7 @@ main(argc, argv)
 	key.data = SEQUENCE;
 	key.size = (u_int32_t)strlen(SEQUENCE);
 
-	if ((ret = seq->open(seq, NULL, &key, DB_CREATE)) != 0) {
+	if ((ret = (seq->open)(seq, NULL, &key, DB_CREATE)) != 0) {
 		dbp->err(dbp, ret, "%s: DB_SEQUENCE->open", SEQUENCE);
 		goto err;
 	}
--- db-4.7.25/examples_c/ex_thread.c
+++ db-4.7.25/examples_c/ex_thread.c
@@ -161,7 +161,7 @@ main(argc, argv)
 
 	if ((ret = dbenv->txn_begin(dbenv, NULL, &txnp, 0)) != 0)
 		fatal("txn_begin", ret, 1);
-	if ((ret = dbp->open(dbp, txnp,
+	if ((ret = (dbp->open)(dbp, txnp,
 	     DATABASE, NULL, DB_BTREE, DB_CREATE | DB_THREAD, 0664)) != 0) {
 		dbp->err(dbp, ret, "%s: open", DATABASE);
 		goto err;
@@ -449,7 +449,7 @@ db_init(home)
 	(void)dbenv->set_cachesize(dbenv, 0, 100 * 1024, 0);
 	(void)dbenv->set_lg_max(dbenv, 200000);
 
-	if ((ret = dbenv->open(dbenv, home,
+	if ((ret = (dbenv->open)(dbenv, home,
 	    DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG |
 	    DB_INIT_MPOOL | DB_INIT_TXN | DB_THREAD, 0)) != 0) {
 		dbenv->err(dbenv, ret, NULL);
--- db-4.7.25/examples_c/ex_tpcb.c
+++ db-4.7.25/examples_c/ex_tpcb.c
@@ -278,7 +278,7 @@ db_init(home, prefix, cachesize, flags)
 
 	local_flags = flags | DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG |
 	    DB_INIT_MPOOL | DB_INIT_TXN;
-	if ((ret = dbenv->open(dbenv, home, local_flags, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, local_flags, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
 		(void)dbenv->close(dbenv, 0);
 		return (NULL);
@@ -311,7 +311,7 @@ tp_populate(env, accounts, branches, history, tellers, verbose)
 	}
 	(void)dbp->set_h_nelem(dbp, (u_int32_t)accounts);
 
-	if ((ret = dbp->open(dbp, NULL, "account", NULL,
+	if ((ret = (dbp->open)(dbp, NULL, "account", NULL,
 	    DB_HASH, oflags, 0644)) != 0) {
 		env->err(env, ret, "DB->open: account");
 		return (1);
@@ -341,7 +341,7 @@ tp_populate(env, accounts, branches, history, tellers, verbose)
 	(void)dbp->set_h_ffactor(dbp, 1);
 	(void)dbp->set_h_nelem(dbp, (u_int32_t)branches);
 	(void)dbp->set_pagesize(dbp, 512);
-	if ((ret = dbp->open(dbp, NULL, "branch", NULL,
+	if ((ret = (dbp->open)(dbp, NULL, "branch", NULL,
 	    DB_HASH, oflags, 0644)) != 0) {
 		env->err(env, ret, "DB->open: branch");
 		return (1);
@@ -369,7 +369,7 @@ tp_populate(env, accounts, branches, history, tellers, verbose)
 	(void)dbp->set_h_ffactor(dbp, 0);
 	(void)dbp->set_h_nelem(dbp, (u_int32_t)tellers);
 	(void)dbp->set_pagesize(dbp, 512);
-	if ((ret = dbp->open(dbp, NULL, "teller", NULL,
+	if ((ret = (dbp->open)(dbp, NULL, "teller", NULL,
 	    DB_HASH, oflags, 0644)) != 0) {
 		env->err(env, ret, "DB->open: teller");
 		return (1);
@@ -392,7 +392,7 @@ tp_populate(env, accounts, branches, history, tellers, verbose)
 		return (1);
 	}
 	(void)dbp->set_re_len(dbp, HISTORY_LEN);
-	if ((ret = dbp->open(dbp, NULL, "history", NULL,
+	if ((ret = (dbp->open)(dbp, NULL, "history", NULL,
 	    DB_RECNO, oflags, 0644)) != 0) {
 		env->err(env, ret, "DB->open: history");
 		return (1);
@@ -530,7 +530,7 @@ tp_run(dbenv, n, accounts, branches, tellers, verbose)
 		dbenv->err(dbenv, ret, "db_create");
 		goto err;
 	}
-	if ((ret = adb->open(adb, NULL, "account", NULL, DB_UNKNOWN,
+	if ((ret = (adb->open)(adb, NULL, "account", NULL, DB_UNKNOWN,
 	    DB_AUTO_COMMIT, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB->open: account");
 		goto err;
@@ -539,7 +539,7 @@ tp_run(dbenv, n, accounts, branches, tellers, verbose)
 		dbenv->err(dbenv, ret, "db_create");
 		goto err;
 	}
-	if ((ret = bdb->open(bdb, NULL, "branch", NULL, DB_UNKNOWN,
+	if ((ret = (bdb->open)(bdb, NULL, "branch", NULL, DB_UNKNOWN,
 	    DB_AUTO_COMMIT, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB->open: branch");
 		goto err;
@@ -548,7 +548,7 @@ tp_run(dbenv, n, accounts, branches, tellers, verbose)
 		dbenv->err(dbenv, ret, "db_create");
 		goto err;
 	}
-	if ((ret = hdb->open(hdb, NULL, "history", NULL, DB_UNKNOWN,
+	if ((ret = (hdb->open)(hdb, NULL, "history", NULL, DB_UNKNOWN,
 	    DB_AUTO_COMMIT, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB->open: history");
 		goto err;
@@ -557,7 +557,7 @@ tp_run(dbenv, n, accounts, branches, tellers, verbose)
 		dbenv->err(dbenv, ret, "db_create");
 		goto err;
 	}
-	if ((ret = tdb->open(tdb, NULL, "teller", NULL, DB_UNKNOWN,
+	if ((ret = (tdb->open)(tdb, NULL, "teller", NULL, DB_UNKNOWN,
 	    DB_AUTO_COMMIT, 0)) != 0) {
 		dbenv->err(dbenv, ret, "DB->open: teller");
 		goto err;
--- db-4.7.25/examples_c/getting_started/gettingstarted_common.c
+++ db-4.7.25/examples_c/getting_started/gettingstarted_common.c
@@ -88,7 +88,7 @@ open_database(DB **dbpp, const char *file_name,
     open_flags = DB_CREATE;    /* Allow database creation */
 
     /* Now open the database */
-    ret = dbp->open(dbp,        /* Pointer to the database */
+    ret = (dbp->open)(dbp,        /* Pointer to the database */
 		    NULL,       /* Txn pointer */
 		    file_name,  /* File name */
 		    NULL,       /* Logical db name */
--- db-4.7.25/examples_c/txn_guide/txn_guide.c
+++ db-4.7.25/examples_c/txn_guide/txn_guide.c
@@ -130,7 +130,7 @@ main(int argc, char *argv[])
       DB_THREAD;       /* Cause the environment to be free-threaded */
 
     /* Now actually open the environment */
-    ret = envp->open(envp, db_home_dir, env_flags, 0);
+    ret = (envp->open)(envp, db_home_dir, env_flags, 0);
     if (ret != 0) {
 	fprintf(stderr, "Error opening environment: %s\n",
 	    db_strerror(ret));
@@ -445,7 +445,7 @@ open_db(DB **dbpp, const char *progname, const char *file_name,
 		 DB_READ_UNCOMMITTED    | /* Allow dirty reads */
 		 DB_AUTO_COMMIT;          /* Allow autocommit */
 
-    ret = dbp->open(dbp,        /* Pointer to the database */
+    ret = (dbp->open)(dbp,        /* Pointer to the database */
 		    NULL,       /* Txn pointer */
 		    file_name,  /* File name */
 		    NULL,       /* Logical db name */
--- db-4.7.25/examples_c/txn_guide/txn_guide_inmemory.c
+++ db-4.7.25/examples_c/txn_guide/txn_guide_inmemory.c
@@ -131,7 +131,7 @@ main(void)
     }
 
     /* Now actually open the environment */
-    ret = envp->open(envp, NULL, env_flags, 0);
+    ret = (envp->open)(envp, NULL, env_flags, 0);
     if (ret != 0) {
 	fprintf(stderr, "Error opening environment: %s\n",
 	    db_strerror(ret));
@@ -435,7 +435,7 @@ open_db(DB **dbpp, const char *progname, const char *file_name,
 		 DB_THREAD        |
 		 DB_AUTO_COMMIT;    /* Allow autocommit */
 
-    ret = dbp->open(dbp,        /* Pointer to the database */
+    ret = (dbp->open)(dbp,        /* Pointer to the database */
 		    NULL,       /* Txn pointer */
 		    file_name,  /* File name */
 		    NULL,       /* Logical db name */
--- db-4.7.25/hsearch/hsearch.c
+++ db-4.7.25/hsearch/hsearch.c
@@ -75,7 +75,7 @@ __db_hcreate(nel)
 	if ((ret = dbp->set_pagesize(dbp, 512)) != 0 ||
 	    (ret = dbp->set_h_ffactor(dbp, 16)) != 0 ||
 	    (ret = dbp->set_h_nelem(dbp, (u_int32_t)nel)) != 0 ||
-	    (ret = dbp->open(dbp, NULL,
+	    (ret = (dbp->open)(dbp, NULL,
 	    NULL, NULL, DB_HASH, DB_CREATE, DB_MODE_600)) != 0)
 		__os_set_errno(ret);
 
--- db-4.7.25/mutex/test_mutex.c
+++ db-4.7.25/mutex/test_mutex.c
@@ -675,7 +675,7 @@ tm_env_init()
 		home = TESTDIR;
 	if (nthreads != 1)
 		flags |= DB_THREAD;
-	if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0) {
 		dbenv->err(dbenv, ret, "environment open: %s", home);
 		return (1);
 	}
--- db-4.7.25/rpc_server/c/db_server_proc.c
+++ db-4.7.25/rpc_server/c/db_server_proc.c
@@ -394,7 +394,7 @@ __env_open_proc(dbenvcl_id, home, flags, mode, replyp)
 		replyp->envcl_id = new_ctp->ct_id;
 		ret = __env_close_int(dbenvcl_id, 0, 0);
 	} else {
-		ret = dbenv->open(dbenv, fullhome->home, newflags, mode);
+		ret = (dbenv->open)(dbenv, fullhome->home, newflags, mode);
 		dbenv_ctp->ct_envdp.home = fullhome;
 		dbenv_ctp->ct_envdp.envflags = shareflags;
 	}
@@ -1389,7 +1389,7 @@ __db_open_proc(dbpcl_id, txnpcl_id, name, subdb, type, flags, mode, replyp)
 		ret = __db_close_int(dbpcl_id, 0);
 		goto out;
 	}
-	ret = dbp->open(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode);
+	ret = (dbp->open)(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode);
 	if (ret == 0) {
 		(void)dbp->get_type(dbp, &dbtype);
 		replyp->type = dbtype;
--- db-4.7.25/rpc_server/c/db_server_util.c
+++ db-4.7.25/rpc_server/c/db_server_util.c
@@ -805,7 +805,7 @@ env_recover(progname)
 			printf("Running recovery on %s\n", hp->home);
 		flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
 		    DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER;
-		if ((ret = dbenv->open(dbenv, hp->home, flags, 0)) != 0) {
+		if ((ret = (dbenv->open)(dbenv, hp->home, flags, 0)) != 0) {
 			dbenv->err(dbenv, ret, "DB_ENV->open");
 			goto error;
 		}
--- db-4.7.25/tcl/tcl_db_pkg.c
+++ db-4.7.25/tcl/tcl_db_pkg.c
@@ -1413,7 +1413,7 @@ bdb_EnvOpen(interp, objc, objv, ip, dbenvp)
 	 * Now open the environment.
 	 */
 	_debug_check();
-	ret = dbenv->open(dbenv, home, open_flags, mode);
+	ret = (dbenv->open)(dbenv, home, open_flags, mode);
 	result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "dbenv open");
 
 	if (rep_flags != 0 && result == TCL_OK) {
@@ -2256,7 +2256,7 @@ bdb_DbOpen(interp, objc, objv, ip, dbp)
 	_debug_check();
 
 	/* Open the database. */
-	ret = (*dbp)->open(*dbp, txn, db, subdb, type, open_flags, mode);
+	ret = ((*dbp)->open)(*dbp, txn, db, subdb, type, open_flags, mode);
 	result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "db open");
 
 error:
@@ -2517,7 +2517,7 @@ bdb_SeqOpen(interp, objc, objv, ip, seqp)
 		    ret, DB_RETOK_STD(ret), "sequence init")) != TCL_OK)
 			goto error;
 	}
-	ret = (*seqp)->open(*seqp, txn, &key, oflags);
+	ret = ((*seqp)->open)(*seqp, txn, &key, oflags);
 	if ((result = _ReturnSetup(interp,
 	    ret, DB_RETOK_STD(ret), "sequence open")) != TCL_OK)
 		goto error;
--- db-4.7.25/tcl/tcl_mp.c
+++ db-4.7.25/tcl/tcl_mp.c
@@ -275,7 +275,7 @@ tcl_Mp(interp, objc, objv, dbenv, envip)
 	 * XXX
 	 * Interface doesn't currently support DB_MPOOLFILE configuration.
 	 */
-	if ((ret = mpf->open(mpf, file, flag, mode, (size_t)pgsize)) != 0) {
+	if ((ret = (mpf->open)(mpf, file, flag, mode, (size_t)pgsize)) != 0) {
 		result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "mpool");
 		_DeleteInfo(ip);
 
--- db-4.7.25/test/scr031/src/client.c
+++ db-4.7.25/test/scr031/src/client.c
@@ -90,7 +90,7 @@ main(int argc, char* argv[])
 
 	/* Join the DB environment. */
 	if ((ret = db_env_create(&dbenv, 0)) != 0 ||
-	    (ret = dbenv->open(dbenv, HOME, DB_JOINENV, 0)) != 0) {
+	    (ret = (dbenv->open)(dbenv, HOME, DB_JOINENV, 0)) != 0) {
 		fprintf(stderr,
 		    "%s: %s: %s\n", progname, HOME, db_strerror(ret));
 		goto err;
@@ -101,7 +101,7 @@ main(int argc, char* argv[])
 
 	/* Open table #3 -- truncate it for each new run. */
 	if ((ret = db_create(&dbp3, dbenv, 0)) != 0 ||
-	    (ret = dbp3->open(dbp3,
+	    (ret = (dbp3->open)(dbp3,
 	    NULL, TABLE3, NULL, DB_BTREE, DB_CREATE, 0660)) != 0) {
 		fprintf(stderr,
 		    "%s: %s %s\n", progname, TABLE3, db_strerror(ret));
@@ -252,7 +252,7 @@ check_data(dbp3)
 
 	/* Open table #1. */
 	if ((ret = db_create(&dbp1, dbenv, 0)) != 0 ||
-	    (ret = dbp1->open(
+	    (ret = (dbp1->open)(
 	    dbp1, NULL, TABLE1, NULL, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
 		fprintf(stderr,
 		    "%s: %s: %s\n", progname, TABLE1, db_strerror(ret));
--- db-4.7.25/test/scr031/src/server.c
+++ db-4.7.25/test/scr031/src/server.c
@@ -74,7 +74,7 @@ tpsvrinit(int argc, char* argv[])
 		fprintf(stderr, "db_env_create: %s\n", db_strerror(ret));
 		return (-1);
 	}
-	if ((ret = dbenv->open(dbenv, HOME, DB_JOINENV, 0)) != 0) {
+	if ((ret = (dbenv->open)(dbenv, HOME, DB_JOINENV, 0)) != 0) {
 		fprintf(stderr,
 		    "DB_ENV->open: %s: %s\n", HOME, db_strerror(ret));
 		return (-1);
@@ -84,7 +84,7 @@ tpsvrinit(int argc, char* argv[])
 		return (-1);
 	}
 	db1->set_errfile(db1, stderr);
-	if ((ret = db1->open(db1, NULL,
+	if ((ret = (db1->open)(db1, NULL,
 	    TABLE1, NULL, DB_BTREE, DB_AUTO_COMMIT | DB_CREATE, 0660)) != 0 ||
 	    (ret = db1->truncate(db1, NULL, NULL, 0)) != 0) {
 		fprintf(stderr,
@@ -96,7 +96,7 @@ tpsvrinit(int argc, char* argv[])
 		return (-1);
 	}
 	db2->set_errfile(db2, stderr);
-	if ((ret = db2->open(db2, NULL,
+	if ((ret = (db2->open)(db2, NULL,
 	    TABLE2, NULL, DB_BTREE, DB_AUTO_COMMIT | DB_CREATE, 0660)) != 0 ||
 	    (ret = db2->truncate(db2, NULL, NULL, 0)) != 0) {
 		fprintf(stderr,
@@ -137,7 +137,7 @@ tpsvrinit(int argc, char* argv[])
 		return (-1);
 	}
 	db1->set_errfile(db1, stderr);
-	if ((ret = db1->open(db1, NULL,
+	if ((ret = (db1->open)(db1, NULL,
 	    TABLE1, NULL, DB_BTREE, DB_AUTO_COMMIT | DB_CREATE, 0660)) != 0) {
 		fprintf(stderr, "DB open: %s: %s\n", TABLE1, db_strerror(ret));
 		return (-1);
@@ -147,7 +147,7 @@ tpsvrinit(int argc, char* argv[])
 		return (-1);
 	}
 	db2->set_errfile(db2, stderr);
-	if ((ret = db2->open(db2, NULL,
+	if ((ret = (db2->open)(db2, NULL,
 	    TABLE2, NULL, DB_BTREE, DB_AUTO_COMMIT | DB_CREATE, 0660)) != 0) {
 		fprintf(stderr, "DB open: %s: %s\n", TABLE2, db_strerror(ret));
 		return (-1);
--- db-4.7.25/xa/xa_db.c
+++ db-4.7.25/xa/xa_db.c
@@ -131,7 +131,7 @@ __xa_open(dbp, txn, name, subdb, type, flags, mode)
 	if ((ret =
 	    __xa_set_txn(dbp, &txn, LF_ISSET(DB_AUTO_COMMIT) ? 1 : 0)) != 0)
 		return (ret);
-	if ((ret = xam->open(dbp, txn, name, subdb, type, flags, mode)) != 0)
+	if ((ret = (xam->open)(dbp, txn, name, subdb, type, flags, mode)) != 0)
 		return (ret);
 
 	/* Wrap any DB handle method that takes a TXN ID as an argument. */