mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-10-02 00:41:44 +02:00
Code

Fiddle with <term.h> vs. <termcap.h> inclusion.

Browse Source
This commit is contained in:
Bart Schaefer 2001-04-12 17:11:39 +00:00
parent 25bcf86626
commit 34f65c6f32
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-04-12 Bart Schaefer <schaefer@brasslantern.com>
* 13965: Src/system.h, Src/prototypes.h, Src/Modules/terminfo.c:
Use <term.h> for termcap protos when it is found but <termcap.h>
is not; don't include <curses.h> unless it will be used.
2001-04-12 Clint Adams <schizo@debian.org>
* 13961: Src/prototypes.h: entertain the possibility that

9
Src/Modules/terminfo.c
View File

@ -29,17 +29,14 @@
#include "terminfo.mdh"
#include "terminfo.pro"
#ifdef HAVE_CURSES_H
# include <curses.h>
#endif
#ifdef HAVE_TERM_H
# include <term.h>
#endif
static char terminfo_nam[] = "terminfo";
/**/
#ifdef HAVE_TIGETSTR
# ifdef HAVE_CURSES_H
# include <curses.h>
# endif
static Param terminfo_pm;

4
Src/prototypes.h
View File

@ -33,15 +33,13 @@ char *realloc _((void *, size_t));
char *calloc _((size_t, size_t));
#endif
#ifndef HAVE_TERMCAP_H
#if !(defined(HAVE_TERMCAP_H) || defined(HAVE_TERM_H))
extern int tgetent _((char *bp, char *name));
extern int tgetnum _((char *id));
extern int tgetflag _((char *id));
extern char *tgetstr _((char *id, char **area));
extern char *tgoto _((char *cm, int destcol, int destline));
# ifndef HAVE_TERM_H
extern int tputs _((char *cp, int affcnt, int (*outc) (int)));
# endif
#endif
/* MISSING PROTOTYPES FOR VARIOUS OPERATING SYSTEMS */

4
Src/system.h
View File

@ -312,6 +312,10 @@ struct timezone {
#ifdef HAVE_TERMCAP_H
# include <termcap.h>
#else
# ifdef HAVE_TERM_H
# include <term.h>
# endif
#endif
#if defined(GWINSZ_IN_SYS_IOCTL) || defined(CLOBBERS_TYPEAHEAD)