diff options
Diffstat (limited to 'crypto/heimdal/appl/telnet/telnet/telnet_locl.h')
| -rw-r--r-- | crypto/heimdal/appl/telnet/telnet/telnet_locl.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/crypto/heimdal/appl/telnet/telnet/telnet_locl.h b/crypto/heimdal/appl/telnet/telnet/telnet_locl.h index 1183b67..503191d 100644 --- a/crypto/heimdal/appl/telnet/telnet/telnet_locl.h +++ b/crypto/heimdal/appl/telnet/telnet/telnet_locl.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: telnet_locl.h,v 1.21 2001/12/20 20:39:52 joda Exp $ */ +/* $Id: telnet_locl.h 18776 2006-10-21 19:14:13Z lha $ */ #ifdef HAVE_CONFIG_H #include <config.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 @@ -153,10 +157,6 @@ struct ether_addr; #include <socks.h> #endif -#include <err.h> -#include <roken.h> -/* krb.h? */ - #if defined(AUTHENTICATION) || defined(ENCRYPTION) #include <libtelnet/auth.h> #include <libtelnet/encrypt.h> @@ -169,6 +169,9 @@ struct ether_addr; #define KLUDGELINEMODE #endif +#include <err.h> +#include <roken.h> + #include "ring.h" #include "externs.h" #include "defines.h" |
