Fix previous change.

diff --git a/src/cm.h b/src/cm.h
index 5e0caa1fa5eab97379e377879c1a0be74d31c616..4567c4474a9fa68d826294e4d9539258fc50503f 100644 (file)
--- 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 <termios.h>
 /* 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 63ffd28b5bac3efde042f45e8e2bb875d354cea7..a72d1977dd30bee767b496b5c1e61f769d975199 100644 (file)
--- 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 <termios.h>
-#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 <termios.h>
 /* 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 ae015b9b6ad1a3847289e0d16e6adfacc8a2d912..870461f5a04164e622c1d82b9f29efacfcd65bb5 100644 (file)
--- 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 <termios.h>
 /* 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.  */