diff options
author | markm <markm@FreeBSD.org> | 2001-08-29 14:16:17 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2001-08-29 14:16:17 +0000 |
commit | 5987cca2b86151d430e62288a0608ec25c84c045 (patch) | |
tree | 2704c88e81d43025eb2e9acbf5530ba5d0ec8f63 /usr.bin | |
parent | 92c57599167493c3bef125d0aa3416a4f3abf082 (diff) | |
download | FreeBSD-src-5987cca2b86151d430e62288a0608ec25c84c045.zip FreeBSD-src-5987cca2b86151d430e62288a0608ec25c84c045.tar.gz |
Manually unifdef(1) CRAY, UNICOS, hpux and sun uselsess code.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/telnet/README | 2 | ||||
-rw-r--r-- | usr.bin/telnet/commands.c | 37 | ||||
-rw-r--r-- | usr.bin/telnet/externs.h | 11 | ||||
-rw-r--r-- | usr.bin/telnet/main.c | 3 | ||||
-rw-r--r-- | usr.bin/telnet/sys_bsd.c | 2 |
5 files changed, 4 insertions, 51 deletions
diff --git a/usr.bin/telnet/README b/usr.bin/telnet/README index 5bec40d..4ed0728 100644 --- a/usr.bin/telnet/README +++ b/usr.bin/telnet/README @@ -14,6 +14,8 @@ have been compiled on: Ultrix 4.3 X X (no linemode in server) Ultrix 4.1 X X (no linemode in server) + NOTE - UNICOS and hpux-specific #ifdef code has now been removed + In addition, previous versions have been compiled on the following machines, but were not available for testing this version. telnet telnetd diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c index 468d708..6cba9c3 100644 --- a/usr.bin/telnet/commands.c +++ b/usr.bin/telnet/commands.c @@ -40,18 +40,12 @@ static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #if defined(unix) #include <sys/param.h> #include <sys/un.h> -#if defined(CRAY) || defined(sysV88) -#include <sys/types.h> -#endif #include <sys/file.h> #else #include <sys/types.h> #endif /* defined(unix) */ #include <sys/socket.h> #include <netinet/in.h> -#ifdef CRAY -#include <fcntl.h> -#endif /* CRAY */ #include <string.h> #include <signal.h> @@ -74,12 +68,10 @@ static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #include "defines.h" #include "types.h" -#if !defined(CRAY) && !defined(sysV88) #include <netinet/in_systm.h> # if (defined(vax) || defined(tahoe) || defined(hp300)) && !defined(ultrix) # include <machine/endian.h> # endif /* vax */ -#endif /* !defined(CRAY) && !defined(sysV88) */ #include <netinet/ip.h> #include <netinet/ip6.h> @@ -886,35 +878,6 @@ static struct setlist Setlist[] = { { 0 } }; -#if defined(CRAY) && !defined(__STDC__) -/* Work around compiler bug in pcc 4.1.5 */ - void -_setlist_init() -{ -#ifndef KLUDGELINEMODE -#define N 5 -#else -#define N 6 -#endif - Setlist[N+0].charp = &termFlushChar; - Setlist[N+1].charp = &termIntChar; - Setlist[N+2].charp = &termQuitChar; - Setlist[N+3].charp = &termEofChar; - Setlist[N+6].charp = &termEraseChar; - Setlist[N+7].charp = &termKillChar; - Setlist[N+8].charp = &termLiteralNextChar; - Setlist[N+9].charp = &termSuspChar; - Setlist[N+10].charp = &termRprntChar; - Setlist[N+11].charp = &termWerasChar; - Setlist[N+12].charp = &termStartChar; - Setlist[N+13].charp = &termStopChar; - Setlist[N+14].charp = &termForw1Char; - Setlist[N+15].charp = &termForw2Char; - Setlist[N+16].charp = &termAytChar; -#undef N -} -#endif /* defined(CRAY) && !defined(__STDC__) */ - static struct setlist * getset(name) char *name; diff --git a/usr.bin/telnet/externs.h b/usr.bin/telnet/externs.h index afa3fdc..d70dfd7 100644 --- a/usr.bin/telnet/externs.h +++ b/usr.bin/telnet/externs.h @@ -53,17 +53,12 @@ #include <stdio.h> #include <setjmp.h> -#if defined(CRAY) && !defined(NO_BSD_SETJMP) -#include <bsdsetjmp.h> -#endif #ifndef FILIO_H #include <sys/ioctl.h> #else #include <sys/filio.h> #endif -#ifdef CRAY # include <errno.h> -#endif /* CRAY */ #ifdef USE_TERMIO # ifndef VINTR # ifdef SYSV_TERMIO @@ -109,10 +104,6 @@ extern char *ipsec_policy_out; #define SUBBUFSIZE 256 -#ifndef CRAY -extern int errno; /* outside this world */ -#endif /* !CRAY */ - #if !defined(P) # ifdef __STDC__ # define P(x) x @@ -428,7 +419,7 @@ extern cc_t termAytChar; # define termAytChar new_tc.c_cc[VSTATUS] #endif -# if !defined(CRAY) || defined(__STDC__) +# if defined(__STDC__) # define termEofCharp &termEofChar # define termEraseCharp &termEraseChar # define termIntCharp &termIntChar diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c index 0cf715d..0f627b2 100644 --- a/usr.bin/telnet/main.c +++ b/usr.bin/telnet/main.c @@ -132,9 +132,6 @@ main(argc, argv) #endif /* FORWARD */ tninit(); /* Clear out things */ -#if defined(CRAY) && !defined(__STDC__) - _setlist_init(); /* Work around compiler bug */ -#endif TerminalSaveState(); diff --git a/usr.bin/telnet/sys_bsd.c b/usr.bin/telnet/sys_bsd.c index ac93ea8..7935821 100644 --- a/usr.bin/telnet/sys_bsd.c +++ b/usr.bin/telnet/sys_bsd.c @@ -63,7 +63,7 @@ static const char rcsid[] = #include "externs.h" #include "types.h" -#if defined(CRAY) || (defined(USE_TERMIO) && !defined(SYSV_TERMIO)) +#if defined(USE_TERMIO) && !defined(SYSV_TERMIO) #define SIG_FUNC_RET void #else #define SIG_FUNC_RET int |