From e083bdd1b4caaffa59c9a87aa65cfa488053d4a9 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 12 Jun 2006 19:59:35 +0000 Subject: [PATCH] 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 --- src/appl/telnet/telnet/externs.h | 3 +-- src/appl/telnet/telnetd/defs.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 #endif -#ifndef HAVE_SYS_FILIO_H #include -#else +#ifdef HAVE_SYS_FILIO_H #include #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 -#else +#ifdef HAVE_SYS_FILIO_H #include #endif -- 2.26.2