From 3947ca4ca9737d830f54658ef353f5626c0d0282 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Wed, 31 May 2017 11:01:46 +0200
Subject: build-sys: ncurses headers cleanup

* assume ncursesw headers in ncursesw/ directory only
* prefer long paths, <term.h> and <ncurses.h> should be last
  possibility
* fix typos

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 lib/colors.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'lib/colors.c')

diff --git a/lib/colors.c b/lib/colors.c
index 72c5158cb..f82496d7a 100644
--- a/lib/colors.c
+++ b/lib/colors.c
@@ -12,12 +12,19 @@
 #include <ctype.h>
 
 #if defined(HAVE_LIBNCURSES) || defined(HAVE_LIBNCURSESW)
-# ifdef HAVE_TERM_H
-#  include <term.h>
+# 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>
+# endif
+# if defined(HAVE_NCURSESW_TERM_H)
+#  include <ncursesw/term.h>
 # elif defined(HAVE_NCURSES_TERM_H)
 #  include <ncurses/term.h>
-# elif defined(HAVE_NCURSESW_TERM_H)
-#  include <ncursesw/term.h>
+# elif defined(HAVE_TERM_H)
+#  include <term.h>
 # endif
 #endif
 
-- 
cgit v1.2.3-55-g7522