about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2012-08-16 13:42:21 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2012-08-16 13:42:21 +0000
commit1849668c81919808b206550fd176b203e67026db (patch)
tree6c68b1f4c63fa38bce6ff9ebcf59a4a138a1e0dc /Src
parentfbc73f05834799d47336efb6d66e0558f9d7a0dc (diff)
downloadzsh-1849668c81919808b206550fd176b203e67026db.tar.gz
zsh-1849668c81919808b206550fd176b203e67026db.tar.xz
zsh-1849668c81919808b206550fd176b203e67026db.zip
30617: rationalise replacement tgoto() prototype
Diffstat (limited to 'Src')
-rw-r--r--Src/prototypes.h9
-rw-r--r--Src/zsh_system.h4
2 files changed, 8 insertions, 5 deletions
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