Imported from util-linux-2.13-pre1 tarball.

1 files changed, 4 insertions, 49 deletions

diff --git a/text-utils/more.c b/text-utils/more.c
index 5b2f5733b..2b4fceb92 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -165,17 +165,12 @@ struct {
 } context, screen_start;
 extern char	PC;		/* pad character */
 
-#ifndef HAVE_termcap
-#define USE_CURSES
-#endif
-
-#ifdef USE_CURSES
-
-#if NCH
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
-#else
-#include <curses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+#include <ncurses/ncurses.h>
 #endif
+
 #include <term.h>			/* include after <curses.h> */
 
 static void
@@ -208,46 +203,6 @@ my_tgoto(const char *cap, int col, int row) {
      return tparm(cap, col, row);
 }
 
-#else /* no CURSES */
-#include <termcap.h>
-
-char termbuffer[4096];
-char tcbuffer[4096];
-char *strbuf = termbuffer;
-
-static void
-my_putstring(char *s) {
-     tputs (s, 1, putchar);
-}
-
-static void
-my_setupterm(const char *term, int fildes, int *errret) {
-     *errret = tgetent(tcbuffer, term);
-}
-
-static int
-my_tgetnum(char *s, char *ss) {
-     return tgetnum(s);
-}
-
-static int
-my_tgetflag(char *s, char *ss) {
-     return tgetflag(s);
-}
-
-static char *
-my_tgetstr(char *s, char *ss) {
-     return tgetstr(s, &strbuf);
-}
-
-static char *
-my_tgoto(const char *cap, int col, int row) {
-     return tgoto(cap, col, row);
-}
-
-
-#endif /* USE_CURSES */
-
 static void
 idummy(int *kk) {}