From 8926118ce27a8c21cd8d8600bb068454ec58baf3 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 17 Jan 2002 22:15:18 +0000 Subject: Remove else clause to #if UI_OUT. --- gdb/mi/ChangeLog | 8 ++++++++ gdb/mi/mi-cmd-break.c | 8 +------- gdb/mi/mi-cmd-stack.c | 6 +----- gdb/mi/mi-main.c | 10 +--------- 4 files changed, 11 insertions(+), 21 deletions(-) (limited to 'gdb/mi') diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog index 7ec4791..88f14ae 100644 --- a/gdb/mi/ChangeLog +++ b/gdb/mi/ChangeLog @@ -1,3 +1,11 @@ +2002-01-13 Andrew Cagney + + * mi-cmd-stack.c: + + * mi-cmd-break.c: + + * mi-main.c: + 2001-12-30 Eli Zaretskii * gdbmi.texinfo: Fix the application of GFDL in the Copyright notice. diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c index 75e100f..5061392 100644 --- a/gdb/mi/mi-cmd-break.c +++ b/gdb/mi/mi-cmd-break.c @@ -1,5 +1,5 @@ /* MI Command Set - breakpoint and watchpoint commands. - Copyright 2000, 2001 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Cygnus Solutions (a Red Hat company). This file is part of GDB. @@ -230,19 +230,13 @@ mi_cmd_break_watch (char *command, char **argv, int argc) switch (type) { case REG_WP: -#ifdef UI_OUT watch_command_wrapper (expr, FROM_TTY); -#endif break; case READ_WP: -#ifdef UI_OUT rwatch_command_wrapper (expr, FROM_TTY); -#endif break; case ACCESS_WP: -#ifdef UI_OUT awatch_command_wrapper (expr, FROM_TTY); -#endif break; default: error ("mi_cmd_break_watch: Unknown watchpoint type."); diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index e9f2dba..f6c7d10 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -1,5 +1,5 @@ /* MI Command Set - stack commands. - Copyright 2000 Free Software Foundation, Inc. + Copyright 2000, 2002 Free Software Foundation, Inc. Contributed by Cygnus Solutions (a Red Hat company). This file is part of GDB. @@ -27,12 +27,10 @@ #include "ui-out.h" #include "symtab.h" -#ifdef UI_OUT /* FIXME: these should go in some .h file but stack.c doesn't have a corresponding .h file. These wrappers will be obsolete anyway, once we pull the plug on the sanitization. */ extern void select_frame_command_wrapper (char *, int); -#endif static void list_args_or_locals (int locals, int values, struct frame_info *fi); @@ -295,7 +293,6 @@ list_args_or_locals (int locals, int values, struct frame_info *fi) enum mi_cmd_result mi_cmd_stack_select_frame (char *command, char **argv, int argc) { -#ifdef UI_OUT if (!target_has_stack) error ("mi_cmd_stack_select_frame: No stack."); @@ -307,6 +304,5 @@ mi_cmd_stack_select_frame (char *command, char **argv, int argc) select_frame_command_wrapper (0, 1 /* not used */ ); else select_frame_command_wrapper (argv[0], 1 /* not used */ ); -#endif return MI_CMD_DONE; } diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 5cb1179..3a59fc8 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1,5 +1,5 @@ /* MI Command Set. - Copyright 2000, 2001 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Cygnus Solutions (a Red Hat company). This file is part of GDB. @@ -81,13 +81,11 @@ static void mi_load_progress (const char *section_name, unsigned long total_sent, unsigned long grand_total); -#ifdef UI_OUT /* FIXME: these should go in some .h file, but infcmd.c doesn't have a corresponding .h file. These wrappers will be obsolete anyway, once we pull the plug on the sanitization. */ extern void interrupt_target_command_wrapper (char *, int); extern void return_command_wrapper (char *, int); -#endif /* Command implementations. FIXME: Is this libgdb? No. This is the MI layer that calls libgdb. Any operation used in the below should be @@ -158,7 +156,6 @@ mi_cmd_exec_until (char *args, int from_tty) enum mi_cmd_result mi_cmd_exec_return (char *args, int from_tty) { -#ifdef UI_OUT /* This command doesn't really execute the target, it just pops the specified number of frames. */ if (*args) @@ -175,7 +172,6 @@ mi_cmd_exec_return (char *args, int from_tty) show_and_print_stack_frame (selected_frame, selected_frame_level, LOC_AND_ADDRESS); -#endif return MI_CMD_DONE; } @@ -195,7 +191,6 @@ mi_cmd_exec_continue (char *args, int from_tty) enum mi_cmd_result mi_cmd_exec_interrupt (char *args, int from_tty) { -#ifdef UI_OUT if (!target_executing) { xasprintf (&mi_error_message, @@ -214,7 +209,6 @@ mi_cmd_exec_interrupt (char *args, int from_tty) mi_out_put (uiout, raw_stdout); mi_out_rewind (uiout); fputs_unfiltered ("\n", raw_stdout); -#endif return MI_CMD_QUIET; } @@ -250,9 +244,7 @@ mi_cmd_thread_list_ids (char *command, char **argv, int argc) return MI_CMD_ERROR; } else -#ifdef UI_OUT rc = gdb_list_thread_ids (uiout); -#endif if (rc == GDB_RC_FAIL) return MI_CMD_CAUGHT_ERROR; -- cgit v1.1