From 515b04d08c5064d710b753d74b0e2eef80992c3a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 15 Jul 1997 18:58:44 +0000 Subject: [PATCH] Fix previous change. --- src/cm.h | 2 +- src/sysdep.c | 7 ++----- src/terminfo.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/cm.h b/src/cm.h index 5e0caa1fa5e..4567c4474a9 100644 --- a/src/cm.h +++ b/src/cm.h @@ -101,7 +101,7 @@ struct cm extern struct cm Wcm; /* Terminal capabilities */ extern char PC; /* Pad character */ -#if defined (HAVE_TERMIOS_H) || defined (LINUX) +#if defined (HAVE_TERMIOS_H) && defined (LINUX) #include /* HJL's version of libc is said to need this on the Alpha. On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short. */ diff --git a/src/sysdep.c b/src/sysdep.c index 63ffd28b5ba..a72d1977dd3 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -27,10 +27,6 @@ Boston, MA 02111-1307, USA. */ #include "blockinput.h" #undef NULL -#ifdef HAVE_TERMIOS_H -#include -#endif - #define min(x,y) ((x) > (y) ? (y) : (x)) /* In this file, open, read and write refer to the system calls, @@ -230,7 +226,8 @@ static int baud_convert[] = }; #endif -#if defined (HAVE_TERMIOS_H) || defined (LINUX) +#if defined (HAVE_TERMIOS_H) && defined (LINUX) +#include /* HJL's version of libc is said to need this on the Alpha. On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short. */ extern speed_t ospeed; diff --git a/src/terminfo.c b/src/terminfo.c index ae015b9b6ad..870461f5a04 100644 --- a/src/terminfo.c +++ b/src/terminfo.c @@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA. */ char *UP, *BC, PC; -#if defined (HAVE_TERMIOS_H) || defined (LINUX) +#if defined (HAVE_TERMIOS_H) && defined (LINUX) #include /* HJL's version of libc is said to need this on the Alpha. On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short. */ -- 2.39.2