From 1849668c81919808b206550fd176b203e67026db Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 16 Aug 2012 13:42:21 +0000 Subject: 30617: rationalise replacement tgoto() prototype --- Src/prototypes.h | 9 ++++++++- Src/zsh_system.h | 4 ---- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'Src') diff --git a/Src/prototypes.h b/Src/prototypes.h index f059b6620..00988ac4c 100644 --- a/Src/prototypes.h +++ b/Src/prototypes.h @@ -49,11 +49,18 @@ extern int tgetent _((char *bp, TC_CONST char *name)); extern int tgetnum _((char *id)); extern int tgetflag _((char *id)); extern char *tgetstr _((char *id, char **area)); -extern char *tgoto _((TC_CONST char *cm, int destcol, int destline)); extern int tputs _((TC_CONST char *cp, int affcnt, int (*outc) (int))); #undef TC_CONST #endif +/* + * Some systems that do have termcap headers nonetheless don't + * declare tgoto, so we detect if that is missing separately. + */ +#ifdef TGOTO_PROTO_MISSING +char *tgoto(const char *cap, int col, int row); +#endif + /* MISSING PROTOTYPES FOR VARIOUS OPERATING SYSTEMS */ #if defined(__hpux) && defined(_HPUX_SOURCE) && !defined(_XPG4_EXTENDED) diff --git a/Src/zsh_system.h b/Src/zsh_system.h index f20a7bb90..f38533023 100644 --- a/Src/zsh_system.h +++ b/Src/zsh_system.h @@ -874,7 +874,3 @@ extern short ospeed; # endif # endif #endif - -#ifdef TGOTO_PROTO_MISSING -char *tgoto(const char *cap, int col, int row); -#endif -- cgit 1.4.1