Mercurial > emacs

changeset 18808:a431fbda7f23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix previous change.
author Richard M. Stallman <rms@gnu.org>
date Tue, 15 Jul 1997 18:58:44 +0000
parents 75b2e402c45d
children 8836f8af1fb5
files src/cm.h src/sysdep.c src/terminfo.c
diffstat 3 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/cm.h	Tue Jul 15 18:51:38 1997 +0000
+++ b/src/cm.h	Tue Jul 15 18:58:44 1997 +0000
@@ -101,7 +101,7 @@
 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	Tue Jul 15 18:51:38 1997 +0000
+++ b/src/sysdep.c	Tue Jul 15 18:58:44 1997 +0000
@@ -27,10 +27,6 @@
 #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 @@
   };
 #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	Tue Jul 15 18:51:38 1997 +0000
+++ b/src/terminfo.c	Tue Jul 15 18:58:44 1997 +0000
@@ -26,7 +26,7 @@
 
 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.  */