diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Modules/termcap.c | 35 |
2 files changed, 27 insertions, 13 deletions
@@ -1,3 +1,8 @@ +2001-04-26 Bart Schaefer <schaefer@zsh.org> + + * 14108: Src/Modules/termcap.c: Don't define USES_TERM* if the + corresponding HAVE_TERM* constants are not defined. + 2001-04-26 Oliver Kiddle <opk@zsh.org> * 14112: Completion/Base/Utility/.distfiles, diff --git a/Src/Modules/termcap.c b/Src/Modules/termcap.c index 845d29f6d..e48c8a16f 100644 --- a/Src/Modules/termcap.c +++ b/Src/Modules/termcap.c @@ -27,37 +27,46 @@ * */ -#define USES_TERMCAP_H 1 -#define USES_TERM_H 1 +/* + * We need to include the zsh headers later to avoid clashes with + * the definitions on some systems, however we need the configuration + * file to decide whether we should avoid curses.h, which clashes + * with several zsh constants on some systems (e.g. SunOS 4). + */ +#include "../../config.h" + +#ifdef HAVE_TGETENT +# if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H) +# define USES_TERM_H 1 +# else +# ifdef HAVE_TERMCAP_H +# define USES_TERMCAP_H 1 +# endif +# endif +#endif + #include "termcap.mdh" #include "termcap.pro" static char termcap_nam[] = "termcap"; -/* echotc: output a termcap */ - #ifdef HAVE_TGETENT -# if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H) +# ifdef USES_TERM_H # ifdef HAVE_TERMIO_H # include <termio.h> # endif # include <curses.h> # include <term.h> # else -# ifdef HAVE_TERMCAP_H +# ifdef USES_TERMCAP_H # include <termcap.h> -# else -# ifdef HAVE_CURSES_H -# include <curses.h> -# endif -# ifdef HAVE_TERM_H -# include <term.h> -# endif # endif # endif static Param termcap_pm; +/* echotc: output a termcap */ + /**/ static int bin_echotc(char *name, char **argv, char *ops, int func) |