Merge branch 'backtrace-errfile'

Conflicts:
	buildheader/make_tdb.cc

buildheader/make_tdb.cc

@@ -464,7 +464,7 @@ static void print_db_env_struct (void) {
                              "void (*set_loader_memory_size)(DB_ENV *env, uint64_t (*get_loader_memory_size_callback)(void))",
                              "uint64_t (*get_loader_memory_size)(DB_ENV *env)",
                              "void (*set_killed_callback)(DB_ENV *env, uint64_t default_killed_time_msec, uint64_t (*get_killed_time_callback)(uint64_t default_killed_time_msec), int (*killed_callback)(void))",
-                             "void (*env_do_backtrace)                    (DB_ENV *env)",
+                             "void (*do_backtrace)                        (DB_ENV *env)",
                              NULL};
 
         sort_and_dump_fields("db_env", true, extra);

src/ydb.cc

@@ -2469,7 +2469,7 @@ static void env_set_killed_callback(DB_ENV *env, uint64_t default_killed_time_ms
 
 static void env_do_backtrace(DB_ENV *env) {
     if (env->i->errfile) {
-        db_env_do_backtrace(env->i->errfile);
+        db_env_do_backtrace((FILE *) env->i->errfile);
     } else {
         db_env_do_backtrace(stderr);
     }