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 dccb424f050d8ba00a16c4742b9f15c1110597bb..3d098adff24859dc0657769d66b6a5385d283eb5 100644 (file)
--- 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 3ceb8653de818d48d23b7796a6d2ef266053b26c..ab653a35f858e835ff622abfc1887db8aec6d1fe 100644 (file)
--- 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