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  <tom@tromey.com>

	* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e65b84d25157088cd17ae5ceb6135333de28f73a..ea228474d87de843f03736afd55f2f73735ea035 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2019-08-20  Tom Tromey  <tom@tromey.com>
+
+       * 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  <tom@tromey.com>
 
        * tui/tui-wingeneral.h (tui_make_window): Don't declare.

diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index a5ff5e2260e88d8410dafcd64f5c301caaa8cbff..dda15d1fbe14d2c1cf20f181b425b96d997339ce 100644 (file)
--- 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 001133c7b5e69e89dd60b405967dccc929baa486..0d411331bbaded49c32d42fc392a0331dc4d8542 100644 (file)
--- 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.