diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2001-04-12 14:56:15 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2001-04-12 14:56:15 +0000 |
| commit | 25bcf866261b9bcffd1cee82521bce7da79edd8a (patch) | |
| tree | a03b3594cebe389360ee24cdbe4841ecce536ed6 | |
| parent | 621155b3ec40ba739e9280e58f07c54d5de23290 (diff) | |
| download | zsh-25bcf866261b9bcffd1cee82521bce7da79edd8a.tar.gz zsh-25bcf866261b9bcffd1cee82521bce7da79edd8a.tar.xz zsh-25bcf866261b9bcffd1cee82521bce7da79edd8a.zip | |
13961: add ifdef for tputs in term.h in prototypes.h
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/prototypes.h | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 3018c2efa..cac8ce1d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-04-12 Clint Adams <schizo@debian.org> + + * 13961: Src/prototypes.h: entertain the possibility that + tputs is defined in term.h. + 2001-04-12 Oliver Kiddle <opk@zsh.org> * 13958: Completion/Zsh/Type/_directory_stack: a hopefully correct diff --git a/Src/prototypes.h b/Src/prototypes.h index f7f560111..7b2aa9d67 100644 --- a/Src/prototypes.h +++ b/Src/prototypes.h @@ -39,7 +39,9 @@ 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 */ @@ -51,7 +53,7 @@ extern int tputs _((char *cp, int affcnt, int (*outc) (int))); # define WRITE_ARG_2_T char * #endif -#if defined(__hpux) && defined(_HPUX_SOURCE) +#if defined(__hpux) && defined(_HPUX_SOURCE) && !defined(_XPG4_EXTENDED) # define SELECT_ARG_2_T int * #else # define SELECT_ARG_2_T fd_set * @@ -66,7 +68,9 @@ char *mktemp _((char *)); # ifndef HAVE_IOCTL_PROTO int ioctl _((int d, unsigned long request, void *argp)); # endif +# ifndef HAVE_MKNOD_PROTO int mknod _((const char *pathname, int mode, dev_t device)); +# endif int nice _((int increment)); int select _((int nfds, fd_set * readfds, fd_set * writefds, fd_set * exceptfds, struct timeval *timeout)); #endif |