diff options
| author | Richard Basch <probe@mit.edu> | 1994-12-27 19:47:11 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1994-12-27 19:47:11 +0000 |
| commit | 2b6555befa869913b53300d41aeb50cd84767e1f (patch) | |
| tree | 44b69c000e8af1b3f86496c6ab21add46e16d8b3 | |
| parent | eda9e393a5353af2fe85ed7ecc8b460f27af7192 (diff) | |
| download | krb5-2b6555befa869913b53300d41aeb50cd84767e1f.tar.gz krb5-2b6555befa869913b53300d41aeb50cd84767e1f.tar.xz krb5-2b6555befa869913b53300d41aeb50cd84767e1f.zip | |
* krlogin.c
Cleaned up some of the includes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4759 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/appl/bsd/krlogin.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c index 6e4dc0b646..508b0d3b58 100644 --- a/src/appl/bsd/krlogin.c +++ b/src/appl/bsd/krlogin.c @@ -77,32 +77,33 @@ char copyright[] = #ifdef _AIX #include <termio.h> #endif -#endif +#else /* POSIX_TERMIOS */ +#include <sgtty.h> +#endif /* POSIX_TERMIOS */ #ifdef HAVE_SYS_SOCKIO_H /* for SIOCATMARK */ #include <sys/sockio.h> #endif -/****** MWE *****/ +#ifdef HAVE_STREAMS +#include <sys/stream.h> +#include <sys/stropts.h> +#endif + #ifdef __SCO__ /* for TIOCPKT_* */ #include <sys/spt.h> /* for struct winsize */ -#include <sys/stream.h> #include <sys/ptem.h> #endif -/****** MWE *****/ -/****** MWE *****/ -/* formerly __svr4__ but that's not defined by suncc */ -#ifdef HAVE_STREAMS +#ifdef HAVE_SYS_PTYVAR_H #include <sys/tty.h> #include <sys/ttold.h> /* solaris actually uses packet mode, so the real macros are needed too */ #include <sys/ptyvar.h> #endif -/****** MWE *****/ /* how do we tell apart irix 5 and irix 4? */ #if defined(__sgi) && defined(__mips) @@ -121,14 +122,11 @@ char copyright[] = #include <sys/ioctl_compat.h> #endif -#ifdef POSIX_TERMIOS #ifdef CRAY #include <sys/ttold.h> #endif -#else /* !POSIX_TERMIOS */ -#include <sgtty.h> -#endif /* POSIX_TERMIOS */ - + + #ifndef roundup #define roundup(x,y) ((((x)+(y)-1)/(y))*(y)) #endif |