From a934d46ac0de07ba3affa7bc0adbf4da3d9798b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 19 May 2005 11:22:53 +0000
Subject: [PATCH] Make Solaris find tgetent

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15181 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/telnet/telnet.c      |  3 ---
 appl/telnet/telnet/telnet_locl.h | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c
index 685c3ca55..2f3f64471 100644
--- a/appl/telnet/telnet/telnet.c
+++ b/appl/telnet/telnet/telnet.c
@@ -32,9 +32,6 @@
  */
 
 #include "telnet_locl.h"
-#ifdef HAVE_TERMCAP_H
-#include <termcap.h>
-#endif
 
 RCSID("$Id$");
 
diff --git a/appl/telnet/telnet/telnet_locl.h b/appl/telnet/telnet/telnet_locl.h
index 2ea10b7f8..a200c4f5b 100644
--- a/appl/telnet/telnet/telnet_locl.h
+++ b/appl/telnet/telnet/telnet_locl.h
@@ -59,23 +59,27 @@
 #include <unistd.h>
 #endif
 
-/* termios.h *must* be included before curses.h */
-#ifdef HAVE_TERMIOS_H
+/* termios.h *must* be included before curses.h, but not on Solaris 9,
+   at least, where we end up with
+   "/usr/include/term.h", line 1060: incomplete struct/union/enum termio: Ottyb
+*/
+#if defined HAVE_TERMIOS_H && !defined __sun
 #include <termios.h>
 #endif
 
-#if defined(SOCKS) && defined(HAVE_CURSES_H)
+#if defined(HAVE_CURSES_H)
 #include <curses.h>
+#ifdef HAVE_TERM_H
+#include <term.h>
+#endif
+#elif defined(HAVE_TERMCAP_H)
+#include <termcap.h>
 #endif
 
 #if defined(HAVE_SYS_TERMIO_H) && !defined(HAVE_TERMIOS_H)
 #include <sys/termio.h>
 #endif
 
-#if defined(HAVE_TERMCAP_H)
-#include <termcap.h>
-#endif
-
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif