From 0c5108691672ee8ab345fb8213a6b9f860ae2ca5 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Thu, 6 Oct 1994 20:41:56 +0000 Subject: [PATCH] PC/ospeed code ifdefed out, our libtermcap use usleep now --- usr.bin/tset/extern.h | 2 ++ usr.bin/tset/set.c | 3 ++- usr.bin/tset/tset.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.bin/tset/extern.h b/usr.bin/tset/extern.h index 0465a66aa04d..7bc180e3706d 100644 --- a/usr.bin/tset/extern.h +++ b/usr.bin/tset/extern.h @@ -34,8 +34,10 @@ */ /* This should be in instead. */ +#ifndef __FreeBSD__ extern char PC; extern short ospeed; +#endif int tgetent __P((char *, char *)); int tgetflag __P((char *)); int tgetnum __P((char *)); diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c index b279a1c38b72..0b6c0a04aeb2 100644 --- a/usr.bin/tset/set.c +++ b/usr.bin/tset/set.c @@ -241,9 +241,10 @@ set_init() int settle; bp = buf; +#ifndef __FreeBSD__ if (tgetstr("pc", &bp) != 0) /* Get/set pad character. */ PC = buf[0]; - +#endif #ifdef TAB3 if (oldmode.c_oflag & (TAB3 | ONLCR | OCRNL | ONLRET)) { oldmode.c_oflag &= (TAB3 | ONLCR | OCRNL | ONLRET); diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c index 60bc5fe0b43c..3fbf3c0e58c6 100644 --- a/usr.bin/tset/tset.c +++ b/usr.bin/tset/tset.c @@ -81,6 +81,7 @@ main(argc, argv) oldmode = mode; Ospeed = cfgetospeed(&mode); +#ifndef __FreeBSD__ switch(Ospeed) { case B0: ospeed = 0; break; case B50: ospeed = 1; break; @@ -109,7 +110,7 @@ main(argc, argv) case B115200: ospeed = 17; break; #endif } - +#endif /* __FreeBSD__ */ if (p = strrchr(*argv, '/')) ++p; else