2011-08-04 Pedro Alves <pedro@codesourcery.com>

[deliverable/binutils-gdb.git] / gdb / exceptions.c

diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index 6704f93e8ddbe2aa97be586e7d872f6bc1383afb..23a85fe54a25abdb322213b37aca21f4f5f513e4 100644 (file)
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -462,16 +462,16 @@ catch_exceptions_with_msg (struct ui_out *func_uiout,
   struct ui_out *saved_uiout;
 
   /* Save and override the global ``struct ui_out'' builder.  */
-  saved_uiout = uiout;
-  uiout = func_uiout;
+  saved_uiout = current_uiout;
+  current_uiout = func_uiout;
 
   TRY_CATCH (exception, RETURN_MASK_ALL)
     {
-      val = (*func) (uiout, func_args);
+      val = (*func) (current_uiout, func_args);
     }
 
   /* Restore the global builder.  */
-  uiout = saved_uiout;
+  current_uiout = saved_uiout;
 
   if (exception.reason < 0 && (mask & RETURN_MASK (exception.reason)) == 0)
     {
@@ -511,7 +511,7 @@ catch_errors (catch_errors_ftype *func, void *func_args, char *errstring,
   struct ui_out *saved_uiout;
 
   /* Save the global ``struct ui_out'' builder.  */
-  saved_uiout = uiout;
+  saved_uiout = current_uiout;
 
   TRY_CATCH (exception, RETURN_MASK_ALL)
     {
@@ -519,7 +519,7 @@ catch_errors (catch_errors_ftype *func, void *func_args, char *errstring,
     }
 
   /* Restore the global builder.  */
-  uiout = saved_uiout;
+  current_uiout = saved_uiout;
 
   if (exception.reason < 0 && (mask & RETURN_MASK (exception.reason)) == 0)
     {