Commit 515b04d0 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

Fix previous change.

parent a2ad45b9
...@@ -101,7 +101,7 @@ struct cm ...@@ -101,7 +101,7 @@ struct cm
extern struct cm Wcm; /* Terminal capabilities */ extern struct cm Wcm; /* Terminal capabilities */
extern char PC; /* Pad character */ extern char PC; /* Pad character */
#if defined (HAVE_TERMIOS_H) || defined (LINUX) #if defined (HAVE_TERMIOS_H) && defined (LINUX)
#include <termios.h> #include <termios.h>
/* HJL's version of libc is said to need this on the Alpha. /* 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. */ On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short. */
......
...@@ -27,10 +27,6 @@ Boston, MA 02111-1307, USA. */ ...@@ -27,10 +27,6 @@ Boston, MA 02111-1307, USA. */
#include "blockinput.h" #include "blockinput.h"
#undef NULL #undef NULL
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
#define min(x,y) ((x) > (y) ? (y) : (x)) #define min(x,y) ((x) > (y) ? (y) : (x))
/* In this file, open, read and write refer to the system calls, /* In this file, open, read and write refer to the system calls,
...@@ -230,7 +226,8 @@ static int baud_convert[] = ...@@ -230,7 +226,8 @@ static int baud_convert[] =
}; };
#endif #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. /* 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. */ On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short. */
extern speed_t ospeed; extern speed_t ospeed;
......
...@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA. */
char *UP, *BC, PC; char *UP, *BC, PC;
#if defined (HAVE_TERMIOS_H) || defined (LINUX) #if defined (HAVE_TERMIOS_H) && defined (LINUX)
#include <termios.h> #include <termios.h>
/* HJL's version of libc is said to need this on the Alpha. /* 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. */ On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment