FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix py-tui.c build problem

Browse source 
py-tui.c can fail to build if the ncurses development headers are not
installed, but if Python was built against ncurses.  In this case, the
Python headers will define HAVE_NCURSES_H, confusing gdb_curses.h.

This patch fixes the problem by moving this include inside
"#ifdef TUI".

gdb/ChangeLog
2020-03-31  Joel Jones  <joelkevinjones@gmail.com>

	PR tui/25597:
	* python/py-tui.c: Include gdb_curses.h inside of #ifdef TUI.
This commit is contained in:
Tom Tromey 2020-03-31 14:07:04 -06:00
parent af62665e13
commit 6f29a53415
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2020-03-31 Joel Jones <joelkevinjones@gmail.com>
PR tui/25597:
* python/py-tui.c: Include gdb_curses.h inside of #ifdef TUI.
2020-03-31 Tom Tromey <tromey@adacore.com> 2020-03-31 Tom Tromey <tromey@adacore.com>
* dwarf2/abbrev.c (abbrev_table::read): Conditionally call * dwarf2/abbrev.c (abbrev_table::read): Conditionally call

8
gdb/python/py-tui.c
View file

@ -21,10 +21,16 @@
#include "defs.h" #include "defs.h"
#include "arch-utils.h" #include "arch-utils.h"
#include "python-internal.h" #include "python-internal.h"
#include "gdb_curses.h"
#ifdef TUI #ifdef TUI
/* Note that Python's public headers may define HAVE_NCURSES_H, so if
we unconditionally include this (outside the #ifdef above), then we
can get a compile error when ncurses is not in fact installed. See
PR tui/25597; or the upstream Python bug
https://bugs.python.org/issue20768. */
#include "gdb_curses.h"
#include "tui/tui-data.h" #include "tui/tui-data.h"
#include "tui/tui-io.h" #include "tui/tui-io.h"
#include "tui/tui-layout.h" #include "tui/tui-layout.h"