X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fgdb_curses.h;h=daca8e51c9eba0c7b59885ea374b16809e4afb65;hb=43771869e5021b6bdc02b6eaae103a33c05a821c;hp=16442c7cecdd5d6430b0dbab217a27af03364c70;hpb=61baf725eca99af2569262d10aca03dcde2698f6;p=external%2Fbinutils.git

diff --git a/gdb/gdb_curses.h b/gdb/gdb_curses.h
index 16442c7..daca8e5 100644
--- a/gdb/gdb_curses.h
+++ b/gdb/gdb_curses.h
@@ -1,6 +1,6 @@
 /* Portable <curses.h>.
 
-   Copyright (C) 2004-2017 Free Software Foundation, Inc.
+   Copyright (C) 2004-2019 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>