Fix tui compilation with Solaris libcurses: clear define (PR tui/21482)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9754ba0474d67085ccf72468d78ac69cb2fc7d56..d5a6c308bf73b52ef02737253ad7c7365c2416b6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 2017-05-19  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
+       PR tui/21482
+       * gdb_curses.h (NOMACROS): Define.
+       (NCURSES_NOMACROS): Define.
+
+2017-05-19  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       PR tui/21482
        * tui/tui-windata.c (tui_erase_data_content): Cast last mvwaddstr
        arg to char *.
        * tui/tui-wingeneral.c (box_win): Likewise.

diff --git a/gdb/gdb_curses.h b/gdb/gdb_curses.h
index 16442c7cecdd5d6430b0dbab217a27af03364c70..72fafe309ba290e6170b747195aaf4c26e789939 100644 (file)
--- a/gdb/gdb_curses.h
+++ b/gdb/gdb_curses.h
@@ -32,6 +32,13 @@
 #undef KEY_EVENT
 #endif
 
+/* On Solaris and probably other SysVr4 derived systems, we need to define
+   NOMACROS so the native <curses.h> doesn't define clear which interferes
+   with the clear member of class string_file.  ncurses potentially has a
+   similar problem and fix.  */
+#define NOMACROS
+#define NCURSES_NOMACROS
+
 #if defined (HAVE_NCURSES_NCURSES_H)
 #include <ncurses/ncurses.h>
 #elif defined (HAVE_NCURSES_H)