diff options
| author | Russ Allbery <rra@stanford.edu> | 2006-06-12 19:59:35 +0000 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2006-06-12 19:59:35 +0000 |
| commit | e083bdd1b4caaffa59c9a87aa65cfa488053d4a9 (patch) | |
| tree | 6d6d083560f6417e2fcbd5be20d9c7734cb1ffae /src/appl | |
| parent | 8a58b4337a9f415da9c578d13edbd9b72f647947 (diff) | |
| download | krb5-e083bdd1b4caaffa59c9a87aa65cfa488053d4a9.zip krb5-e083bdd1b4caaffa59c9a87aa65cfa488053d4a9.tar.gz krb5-e083bdd1b4caaffa59c9a87aa65cfa488053d4a9.tar.bz2 | |
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
Diffstat (limited to 'src/appl')
| -rw-r--r-- | src/appl/telnet/telnet/externs.h | 3 | ||||
| -rw-r--r-- | 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 dccb424..3d098ad 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 3ceb865..ab653a3 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 |