diff options
| author | Richard M. Stallman <rms@gnu.org> | 1997-07-15 18:58:44 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1997-07-15 18:58:44 +0000 |
| commit | 034dd4f871b96feddcb12b1cf0f58243d41eedcd (patch) | |
| tree | fa5474161c4c9f57c34f10a248971dafd951eed5 | |
| parent | d94faa7bc95ae01ca050cc50382713a63af205a8 (diff) | |
| download | emacs-034dd4f871b96feddcb12b1cf0f58243d41eedcd.tar.gz | |
Fix previous change.
| -rw-r--r-- | src/cm.h | 2 | ||||
| -rw-r--r-- | src/sysdep.c | 7 | ||||
| -rw-r--r-- | src/terminfo.c | 2 |
3 files changed, 4 insertions, 7 deletions
@@ -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 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 <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 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 <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. */ |