From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Fri, 19 May 2017 13:03:52 +0000 (+0200)
Subject: Fix tui compilation with Solaris libcurses: clear define (PR tui/21482)
X-Git-Tag: gdb-8.0-release~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=814385bb257fec68e0e64d43f2ccc40e219342e7;p=thirdparty%2Fbinutils-gdb.git

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9754ba0474d..d5a6c308bf7 100644
--- 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 16442c7cecd..72fafe309ba 100644
--- 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)