summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Src/prototypes.h9
-rw-r--r--Src/zsh_system.h4
3 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fafaa14ac..424c6c83c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-16  Peter Stephenson  <pws@csr.com>
+
+	* 30617: Src/prototypes.h, Src/zsh_system.h: rationalise
+	replacement of tgoto() prototype which could appear twice
+	inconsistently.
+
 2012-08-14  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted: Etc/relnote_5.0.0.txt, Etc/.distfiles: add.
@@ -51,5 +57,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5694 $
+* $Revision: 1.5695 $
 *****************************************************
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