From 973961bda3cdf79e4c0768a5a5fd4eb6ab4acad2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 13 Jul 2019 18:29:57 -0600 Subject: [PATCH] Move some defines to tui-stack.c Some #defines in tui-data.h are only used in tui-stack.c, so move them there. 2019-08-20 Tom Tromey * tui/tui-data.h (PROC_PREFIX, LINE_PREFIX, PC_PREFIX) (MIN_LINE_WIDTH, MIN_PROC_WIDTH, MAX_TARGET_WIDTH) (MAX_PID_WIDTH): Move to tui-stack.c. * tui/tui-stack.c (PROC_PREFIX, LINE_PREFIX, PC_PREFIX) (MIN_LINE_WIDTH, MIN_PROC_WIDTH, MAX_TARGET_WIDTH) (MAX_PID_WIDTH): Move from tui-data.h. --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-data.h | 11 ----------- gdb/tui/tui-stack.c | 12 ++++++++++++ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e65b84d..ea22847 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2019-08-20 Tom Tromey + * tui/tui-data.h (PROC_PREFIX, LINE_PREFIX, PC_PREFIX) + (MIN_LINE_WIDTH, MIN_PROC_WIDTH, MAX_TARGET_WIDTH) + (MAX_PID_WIDTH): Move to tui-stack.c. + * tui/tui-stack.c (PROC_PREFIX, LINE_PREFIX, PC_PREFIX) + (MIN_LINE_WIDTH, MIN_PROC_WIDTH, MAX_TARGET_WIDTH) + (MAX_PID_WIDTH): Move from tui-data.h. + +2019-08-20 Tom Tromey + * tui/tui-wingeneral.h (tui_make_window): Don't declare. * tui/tui-wingeneral.c (box_win): Change type of win_info. (box_win): Update. diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index a5ff5e2..dda15d1 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -108,19 +108,8 @@ public: #define MIN_CMD_WIN_HEIGHT 3 /* Strings to display in the TUI status line. */ -#define PROC_PREFIX "In: " -#define LINE_PREFIX "L" -#define PC_PREFIX "PC: " #define SINGLE_KEY "(SingleKey)" -/* Minimum/Maximum length of some fields displayed in the TUI status - line. */ -#define MIN_LINE_WIDTH 4 /* Use at least 4 digits for line - numbers. */ -#define MIN_PROC_WIDTH 12 -#define MAX_TARGET_WIDTH 10 -#define MAX_PID_WIDTH 19 - /* The kinds of layouts available. */ enum tui_layout_type { diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index 001133c..0d41133 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -39,6 +39,18 @@ #include "gdb_curses.h" +#define PROC_PREFIX "In: " +#define LINE_PREFIX "L" +#define PC_PREFIX "PC: " + +/* Minimum/Maximum length of some fields displayed in the TUI status + line. */ +#define MIN_LINE_WIDTH 4 /* Use at least 4 digits for line + numbers. */ +#define MIN_PROC_WIDTH 12 +#define MAX_TARGET_WIDTH 10 +#define MAX_PID_WIDTH 19 + static struct tui_locator_window _locator; /* Get a printable name for the function at the address. -- 2.7.4