X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Ftermsbr.c;h=93e6dd629a39d5b398a4507fb136a77b95386f7a;hb=a93204a5abced109070990a2b9d567344f352cbd;hp=740d021066b2909a899f146e193708884c682c1e;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh diff --git a/uip/termsbr.c b/uip/termsbr.c index 740d021..93e6dd6 100644 --- a/uip/termsbr.c +++ b/uip/termsbr.c @@ -9,15 +9,7 @@ #include -#ifdef HAVE_TERMIOS_H -# include -#else -# ifdef HAVE_TERMIO_H -# include -# else -# include -# endif -#endif +#include #ifdef HAVE_TERMCAP_H # include @@ -42,19 +34,27 @@ # define TXTSIZ BUFSIZ #endif +#ifdef notdef_lyndon_posix + +/* + XXX No current termcap should need this. If your compile barfs, + email details to lyndon@orthanc.ca. This code will vanish soon ... +*/ /* * These variables are sometimes defined in, * and needed by the termcap library. */ -#ifdef HAVE_OSPEED -# ifdef MUST_DEFINE_OSPEED +# ifdef HAVE_OSPEED +# ifdef MUST_DEFINE_OSPEED extern short ospeed; extern char PC; -# endif -#else +# endif +# else short ospeed; char PC; -#endif +# endif + +#endif notdef_lyndon_posix static long speedcode; @@ -81,16 +81,7 @@ read_termcap(void) char termbuf[TXTSIZ]; #endif -#ifdef HAVE_TERMIOS_H struct termios tio; -#else -# ifdef HAVE_TERMIO_H - struct termio tio; -# else - struct sgttyb tio; -# endif -#endif - static int inited = 0; if (inited++) @@ -110,15 +101,7 @@ read_termcap(void) return; #endif -#ifdef HAVE_TERMIOS_H speedcode = cfgetospeed(&tio); -#else -# ifdef HAVE_TERMIO_H - speedcode = ioctl(fileno(stdout), TCGETA, &tio) != NOTOK ? tio.c_cflag & CBAUD : 0; -# else - speedcode = ioctl(fileno(stdout), TIOCGETP, (char *) &tio) != NOTOK ? tio.sg_ospeed : 0; -# endif -#endif HC = tgetflag ("hc");