Author: lha Date: 2006-10-20 16:15:43 +0000 (Fri, 20 Oct 2006) New Revision: 610
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=610 Log: merge from heimdal cvs - include roken.h to avoid ioctl(socket_wrapper) in solaris headers Modified: trunk/heimdal/appl/telnet/telnet/telnet_locl.h Changeset: Modified: trunk/heimdal/appl/telnet/telnet/telnet_locl.h =================================================================== --- trunk/heimdal/appl/telnet/telnet/telnet_locl.h 2006-10-20 15:22:28 UTC (rev 609) +++ trunk/heimdal/appl/telnet/telnet/telnet_locl.h 2006-10-20 16:15:43 UTC (rev 610) @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: telnet_locl.h,v 1.22 2005/05/19 11:22:53 lha Exp $ */ +/* $Id: telnet_locl.h,v 1.23 2006/10/20 16:12:47 lha Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> @@ -157,10 +157,6 @@ #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> @@ -178,5 +174,8 @@ #include "defines.h" #include "types.h" +#include <err.h> +#include <roken.h> + /* prototypes */