#include "frame.h"
/* For gdb_environ. */
-#include "environ.h"
+#include "common/environ.h"
#include "progspace.h"
#include "registry.h"
#include "symfile-add-flags.h"
#include "common/refcounted-object.h"
+#include "common/forward-scope-exit.h"
-#include "common-inferior.h"
+#include "common/common-inferior.h"
#include "gdbthread.h"
struct infcall_suspend_state;
extern void interrupt_target_1 (int all_threads);
-extern void delete_longjmp_breakpoint_cleanup (void *arg);
+using delete_longjmp_breakpoint_cleanup
+ = FORWARD_SCOPE_EXIT (delete_longjmp_breakpoint);
extern void detach_command (const char *, int);
the inferior object's refcount, to prevent something deleting the
inferior object before reverting back (e.g., due to a
"remove-inferiors" command (see
- make_cleanup_restore_current_thread). All other inferior
+ scoped_restore_current_inferior). All other inferior
references are considered weak references. Inferiors are always
listed exactly once in the inferior list, so placing an inferior in
the inferior list is an implicit, not counted strong reference. */