* top.c (quit_target): Use all_cleanups.

	* main.c (captured_command_loop): Use all_cleanups.
	* exceptions.c (throw_exception): Use all_cleanups.

4 files changed, 10 insertions, 4 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 73ae3b4..521940c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-19  Tom Tromey  <tromey@redhat.com>
+
+	* top.c (quit_target): Use all_cleanups.
+	* main.c (captured_command_loop): Use all_cleanups.
+	* exceptions.c (throw_exception): Use all_cleanups.
+
 2012-04-19  Pedro Alves  <palves@redhat.com>
 
 	* Makefile.in (GNULIB_BUILDDIR): New.
diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index 0dcad71..7db9df9 100644
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -224,7 +224,7 @@ throw_exception (struct gdb_exception exception)
   quit_flag = 0;
   immediate_quit = 0;
 
-  do_cleanups (ALL_CLEANUPS);
+  do_cleanups (all_cleanups ());
 
   /* Jump to the containing catch_errors() call, communicating REASON
      to that call via setjmp's return value.  Note that REASON can't
diff --git a/gdb/main.c b/gdb/main.c
index fe41551..3148d72 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -231,7 +231,7 @@ captured_command_loop (void *data)
      are not that well behaved.  do_cleanups should either be replaced
      with a do_cleanups call (to cover the problem) or an assertion
      check to detect bad FUNCs code.  */
-  do_cleanups (ALL_CLEANUPS);
+  do_cleanups (all_cleanups ());
   /* If the command_loop returned, normally (rather than threw an
      error) we try to quit.  If the quit is aborted, catch_errors()
      which called this catch the signal and restart the command
diff --git a/gdb/top.c b/gdb/top.c
index 55e4504..a138480 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -1297,8 +1297,8 @@ quit_target (void *arg)
   if (write_history_p && history_filename)
     write_history (history_filename);
 
-  do_final_cleanups (ALL_CLEANUPS);    /* Do any final cleanups before
-					  exiting.  */
+  do_final_cleanups (all_cleanups ());    /* Do any final cleanups before
+					     exiting.  */
   return 0;
 }