diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-03-13 11:10:59 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-03-13 11:10:59 +0000 |
| commit | 2ca42b2025cceaabd64889aa3b932195e8d5720c (patch) | |
| tree | 3411d35057120791220f7fff1b2944cc912a4389 /Src/Modules/terminfo.c | |
| parent | 37a7e813905ceba883493a70f81ab8695627662f (diff) | |
| download | zsh-2ca42b2025cceaabd64889aa3b932195e8d5720c.tar.gz zsh-2ca42b2025cceaabd64889aa3b932195e8d5720c.zip | |
24705: rationalise curses and term headers even more
Diffstat (limited to 'Src/Modules/terminfo.c')
| -rw-r--r-- | Src/Modules/terminfo.c | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/Src/Modules/terminfo.c b/Src/Modules/terminfo.c index 1038c243e..db9a6c053 100644 --- a/Src/Modules/terminfo.c +++ b/Src/Modules/terminfo.c @@ -30,7 +30,7 @@ #define USES_TERM_H 1 #include "terminfo.mdh" -#if defined(HAVE_TIGETFLAG) && (defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H) || defined(HAVE_NCURSESW_NCURSES_H)) +#if defined(HAVE_TIGETFLAG) && defined(ZSH_HAVE_CURSES_H) # define USE_TERMINFO_MODULE 1 #else # undef USE_TERMINFO_MODULE @@ -49,30 +49,12 @@ # undef offsetof # endif -#ifdef ZSH_IGNORE_NCURSES -# ifdef HAVE_CURSES_H -# include <curses.h> -# endif -#else -# ifdef HAVE_NCURSESW_NCURSES_H -# include <ncursesw/ncurses.h> -# else -# ifdef HAVE_NCURSES_NCURSES_H -# include <ncurses/ncurses.h> -# else -# ifdef HAVE_NCURSES_H -# include <ncurses.h> -# else -# ifdef HAVE_CURSES_H -# include <curses.h> -# endif -# endif -# endif -# endif +#ifdef ZSH_HAVE_CURSES_H +# include "../zshcurses.h" #endif -# ifdef HAVE_TERM_H -# include <term.h> +# ifdef ZSH_HAVE_TERM_H +# include "../zshterm.h" # endif /* echoti: output a terminfo capability */ |