about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2001-04-20 14:22:23 +0000
committerClint Adams <clint@users.sourceforge.net>2001-04-20 14:22:23 +0000
commited28d19b969ab0d6f7983f37e7700d1f70b512fb (patch)
tree6c632ca5dbc45cad7f8dd186a8c1821402883633
parent92902608e4830b14d2fe4f8bab30cafc40d4ad26 (diff)
downloadzsh-ed28d19b969ab0d6f7983f37e7700d1f70b512fb.tar.gz
zsh-ed28d19b969ab0d6f7983f37e7700d1f70b512fb.tar.xz
zsh-ed28d19b969ab0d6f7983f37e7700d1f70b512fb.zip
14055: include termio.h in termcap.c for the benefit of Solaris 8
-rw-r--r--ChangeLog3
-rw-r--r--Src/Modules/termcap.c20
2 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 90dc42456..8636cd1a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-04-20  Clint Adams  <schizo@debian.org>
 
+	* 14055: Src/Modules/termcap.c: include termio.h if available.
+	This prevents Solaris 8 from choking on term.h.
+
 	* 14053: Src/Modules/termcap.c, Src/Modules/termcap.mdd:
 	add ${termcap} special parameter in the style of ${terminfo}.
 
diff --git a/Src/Modules/termcap.c b/Src/Modules/termcap.c
index 9da9f65cb..35fb71f64 100644
--- a/Src/Modules/termcap.c
+++ b/Src/Modules/termcap.c
@@ -39,13 +39,19 @@ static char termcap_nam[] = "termcap";
 #ifdef HAVE_TGETENT
 # ifdef HAVE_TERMCAP_H
 #  include <termcap.h>
-# endif
-
-# ifdef HAVE_CURSES_H
-#  include <curses.h>
-# endif
-# ifdef HAVE_TERM_H
-#  include <term.h>
+#  ifdef HAVE_TERM_H
+#   include <term.h>
+#  endif
+# else
+#  ifdef HAVE_TERMIO_H
+#   include <termio.h>
+#  endif
+#  ifdef HAVE_CURSES_H
+#   include <curses.h>
+#  endif
+#  ifdef HAVE_TERM_H
+#   include <term.h>
+#  endif
 # endif
 
 static Param termcap_pm;