X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgdb_curses.h;h=1020aaa3c5562fbd312a432567f0e3dcffb186ba;hb=c17e02e1b55b5e9cbdc6581f05bfec96dc8436f4;hp=a89383f92ba1bf17eeb2645024d9b4484eccf471;hpb=d053f6be557fa3bedd4ccbd969103dbb51a37439;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/gdb_curses.h b/gdb/gdb_curses.h
index a89383f92b..1020aaa3c5 100644
--- a/gdb/gdb_curses.h
+++ b/gdb/gdb_curses.h
@@ -1,6 +1,6 @@
 /* Portable <curses.h>.
 
-   Copyright (C) 2004-2015 Free Software Foundation, Inc.
+   Copyright (C) 2004-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -32,7 +32,16 @@
 #undef KEY_EVENT
 #endif
 
-#if defined (HAVE_NCURSES_NCURSES_H)
+/* 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_NCURSESW_NCURSES_H)
+#include <ncursesw/ncurses.h>
+#elif defined (HAVE_NCURSES_NCURSES_H)
 #include <ncurses/ncurses.h>
 #elif defined (HAVE_NCURSES_H)
 #include <ncurses.h>