From: Karel Zak <kzak@redhat.com>
Date: Fri, 3 Jun 2016 12:51:01 +0000 (+0200)
Subject: more: don't include ncurses.h, fix for non-widechar
X-Git-Tag: v2.29-rc1~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=324e52a5cf5a7016807c81e8c9d668aa8fad8b34;p=thirdparty%2Futil-linux.git

more: don't include ncurses.h, fix for non-widechar

It seems our crazy widechar.h is in conflict with ncurses, but it
seems that nothing in more.c requires anything from ncurses. All we
need is probably <term.h>.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/text-utils/more.c b/text-utils/more.c
index 0a5f4942ca..21e0cbc702 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -190,11 +190,6 @@ struct {
 } context, screen_start;
 extern char PC;			/* pad character */
 
-#ifdef HAVE_NCURSES_H
-# include <ncurses.h>
-#elif defined(HAVE_NCURSES_NCURSES_H)
-# include <ncurses/ncurses.h>
-#endif
 #include <term.h>		/* include after <curses.h> */
 
 #define TERM_AUTO_RIGHT_MARGIN    "am"
@@ -1007,6 +1002,7 @@ void clreos(void)
 }
 
 
+#ifdef HAVE_WIDECHAR
 static UL_ASAN_BLACKLIST size_t xmbrtowc(wchar_t *wc, const char *s, size_t n,
 				  mbstate_t *mbstate)
 {
@@ -1015,6 +1011,7 @@ static UL_ASAN_BLACKLIST size_t xmbrtowc(wchar_t *wc, const char *s, size_t n,
 		return 1;
 	return mblength;
 }
+#endif
 
 /* Print a buffer of n characters */
 void prbuf(register char *s, register int n)