From: Russ Allbery <rra@stanford.edu>
Date: Mon, 12 Jun 2006 19:59:35 +0000 (+0000)
Subject: Always include sys/ioctl.h in the telnet and telnetd code, even if
X-Git-Tag: krb5-1.5-beta1~43
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e083bdd1b4caaffa59c9a87aa65cfa488053d4a9;p=krb5.git

Always include sys/ioctl.h in the telnet and telnetd code, even if
sys/filio.h is available.  GNU/kFreeBSD has sys/filio.h but still
requires sys/ioctl.h, and sys/ioctl.h is included unconditionally
elsewhere in the code.  Patch from Petr Salinger.

Ticket: 3466

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18117 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/telnet/telnet/externs.h b/src/appl/telnet/telnet/externs.h
index dccb424f0..3d098adff 100644
--- a/src/appl/telnet/telnet/externs.h
+++ b/src/appl/telnet/telnet/externs.h
@@ -57,9 +57,8 @@
 #if defined(CRAY) && !defined(NO_BSD_SETJMP)
 #include <bsdsetjmp.h>
 #endif
-#ifndef	HAVE_SYS_FILIO_H
 #include <sys/ioctl.h>
-#else
+#ifdef	HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
 #ifdef CRAY
diff --git a/src/appl/telnet/telnetd/defs.h b/src/appl/telnet/telnetd/defs.h
index 3ceb8653d..ab653a35f 100644
--- a/src/appl/telnet/telnetd/defs.h
+++ b/src/appl/telnet/telnetd/defs.h
@@ -89,9 +89,8 @@
 # endif
 #endif
 
-#ifndef	HAVE_SYS_FILIO_H
 #include <sys/ioctl.h>
-#else
+#ifdef	HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif