Fix previous change.

515b04d0 · Richard M. Stallman · a2ad45b9 · 515b04d0 · 515b04d0 · 515b04d0
Commit 515b04d0 authored Jul 15, 1997 by Richard M. Stallman
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

src/cm.h src/cm.h +1 -1

src/sysdep.c src/sysdep.c +2 -5

src/terminfo.c src/terminfo.c +1 -1

No files found.
--- 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.  */

--- 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;

--- 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.  */