aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2019-12-04 08:08:13 -0700
committerTom Tromey <tromey@adacore.com>2019-12-04 08:08:13 -0700
commit7a9e9f9f1e78a085fdf60faadd83990c3ca6d18c (patch)
treeb2dea27f62757d1c2f33cd8df87479cb10c235a2
parentfeee869bd84841bc048b4ca60a8713d80f8be5d9 (diff)
downloadgdb-7a9e9f9f1e78a085fdf60faadd83990c3ca6d18c.zip
gdb-7a9e9f9f1e78a085fdf60faadd83990c3ca6d18c.tar.gz
gdb-7a9e9f9f1e78a085fdf60faadd83990c3ca6d18c.tar.bz2
Fix another build failure in tui-selftests.c
Christian had emailed me to say that the TUI unit test broke the mingw build, but I erroneously thought this was fixed by the earlier patch that made the test body conditional on the TUI being built. However, I was wrong about this -- tui-selftests.c unconditionally includes tui-winsource.h, which fails if curses is not available. This patch fixes the build problem by moving this include into the "#ifdef TUI" section. Tested by rebuilding a mingw-hosted gdb. gdb/ChangeLog 2019-12-04 Tom Tromey <tromey@adacore.com> * unittests/tui-selftests.c: Conditionally include tui-winsource.h. Change-Id: If608649ef5cbef8ea92192e11c53379742967ee7
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/unittests/tui-selftests.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f27043d..8837a23 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2019-12-04 Tom Tromey <tromey@adacore.com>
+ * unittests/tui-selftests.c: Conditionally include tui-winsource.h.
+
+2019-12-04 Tom Tromey <tromey@adacore.com>
+
* dwarf2read.c (process_structure_scope): Initialize
"discr_offset".
diff --git a/gdb/unittests/tui-selftests.c b/gdb/unittests/tui-selftests.c
index 95c12e3..03969ea 100644
--- a/gdb/unittests/tui-selftests.c
+++ b/gdb/unittests/tui-selftests.c
@@ -19,10 +19,11 @@
#include "defs.h"
#include "gdbsupport/selftest.h"
-#include "tui/tui-winsource.h"
#ifdef TUI
+#include "tui/tui-winsource.h"
+
namespace selftests {
namespace tui {