ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Karel Zak 2016-06-03 14:51:01 +02:00
parent e19916c89d
commit 324e52a5cf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
text-utils/more.c
View File

@ -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)