gdb/python: Fix --disable-tui build

Message ID 20230224120650.286869-1-legouguec@adacore.com
State Committed
Commit 1d6653fd3f4e0d7140e705733412fd75c40177b2
Headers
Series gdb/python: Fix --disable-tui build |

Commit Message

Kévin Le Gouguec Feb. 24, 2023, 12:06 p.m. UTC
  As of 2023-02-13 "gdb/python: deallocate tui window factories at Python
shut down" (9ae4519da90), a TUI-less build fails with:

$src/gdb/python/py-tui.c: In function ‘void gdbpy_finalize_tui()’:
$src/gdb/python/py-tui.c:621:3: error: ‘gdbpy_tui_window_maker’ has not been declared
  621 |   gdbpy_tui_window_maker::invalidate_all ();
      |   ^~~~~~~~~~~~~~~~~~~~~~

Since gdbpy_tui_window_maker is only defined under #ifdef TUI, add an
#ifdef guard in gdbpy_finalize_tui as well.
---

Assuming I have not missed something, this might have been an "obvious
fix"?  Since no-one has complained about this so far, I figure it does
not hurt to post the patch first before pushing.

 gdb/python/py-tui.c | 2 ++
 1 file changed, 2 insertions(+)
  

Comments

Kévin Le Gouguec March 6, 2023, 4:47 p.m. UTC | #1
Kévin Le Gouguec <legouguec@adacore.com> writes:

> Assuming I have not missed something, this might have been an "obvious
> fix"?  Since no-one has complained about this so far, I figure it does
> not hurt to post the patch first before pushing.

I pushed this today (1d6653fd3f4), after confirming the obviousness with
Tom out-of-band.

>  gdb/python/py-tui.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/gdb/python/py-tui.c b/gdb/python/py-tui.c
> index 9ce76659052..92fa0591e5c 100644
> --- a/gdb/python/py-tui.c
> +++ b/gdb/python/py-tui.c
> @@ -618,5 +618,7 @@ gdbpy_initialize_tui ()
>  void
>  gdbpy_finalize_tui ()
>  {
> +#ifdef TUI
>    gdbpy_tui_window_maker::invalidate_all ();
> +#endif	/* TUI */
>  }
  

Patch

diff --git a/gdb/python/py-tui.c b/gdb/python/py-tui.c
index 9ce76659052..92fa0591e5c 100644
--- a/gdb/python/py-tui.c
+++ b/gdb/python/py-tui.c
@@ -618,5 +618,7 @@  gdbpy_initialize_tui ()
 void
 gdbpy_finalize_tui ()
 {
+#ifdef TUI
   gdbpy_tui_window_maker::invalidate_all ();
+#endif	/* TUI */
 }