diff options
-rw-r--r-- | gdb/ChangeLog | 9 | ||||
-rw-r--r-- | gdb/top.c | 38 |
2 files changed, 35 insertions, 12 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3652685..57e8f6b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2019-11-21 Simon Marchi <simon.marchi@polymtl.ca> + + * top.c (current_ui_gdb_stdout_ptr): Spell out by hand. + (current_ui_gdb_stdin_ptr): Likewise. + (current_ui_gdb_stderr_ptr): Likewise. + (current_ui_gdb_stdlog_ptr): Likewise. + (current_ui_current_uiout_ptr): Likewise. + (gen_ret_current_ui_field_ptr): Remove. + 2019-11-21 Tom de Vries <tdevries@suse.de> PR gdb/24956 @@ -92,21 +92,35 @@ extern void initialize_all_files (void); #define DEFAULT_PROMPT "(gdb) " #endif -/* Generate a function that exports a pointer to a field of the - current UI. */ +struct ui_file ** +current_ui_gdb_stdout_ptr () +{ + return ¤t_ui->m_gdb_stdout; +} + +struct ui_file ** +current_ui_gdb_stdin_ptr () +{ + return ¤t_ui->m_gdb_stdin; +} -#define gen_ret_current_ui_field_ptr(type, name) \ -type * \ -current_ui_## name ## _ptr (void) \ -{ \ - return ¤t_ui->m_ ## name; \ +struct ui_file ** +current_ui_gdb_stderr_ptr () +{ + return ¤t_ui->m_gdb_stderr; } -gen_ret_current_ui_field_ptr (struct ui_file *, gdb_stdout) -gen_ret_current_ui_field_ptr (struct ui_file *, gdb_stdin) -gen_ret_current_ui_field_ptr (struct ui_file *, gdb_stderr) -gen_ret_current_ui_field_ptr (struct ui_file *, gdb_stdlog) -gen_ret_current_ui_field_ptr (struct ui_out *, current_uiout) +struct ui_file ** +current_ui_gdb_stdlog_ptr () +{ + return ¤t_ui->m_gdb_stdlog; +} + +struct ui_out ** +current_ui_current_uiout_ptr () +{ + return ¤t_ui->m_current_uiout; +} int inhibit_gdbinit = 0; |