summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1996-07-16 22:37:24 +0000
committerKarl Heuer <kwzh@gnu.org>1996-07-16 22:37:24 +0000
commit9f80a1c88958bd05242d96a22563e4fc178ad5e5 (patch)
tree81b4614974e441b0f2e78e69273c81891e899af5
parentad4bf9a06194135d938ae4aedd2daa7b16819eeb (diff)
downloademacs-9f80a1c88958bd05242d96a22563e4fc178ad5e5.tar.gz
Undo previous changes.
-rw-r--r--src/sysdep.c7
-rw-r--r--src/terminfo.c13
2 files changed, 2 insertions, 18 deletions
diff --git a/src/sysdep.c b/src/sysdep.c
index 189fe583edd..5baf95c92b5 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -220,12 +220,7 @@ static int baud_convert[] =
};
#endif
-#ifdef HAVE_TERMIOS
-# include <termios.h>
- extern speed_t ospeed;
-#else
- extern short ospeed;
-#endif
+extern short ospeed;
/* The file descriptor for Emacs's input terminal.
Under Unix, this is normally zero except when using X;
diff --git a/src/terminfo.c b/src/terminfo.c
index 5f2d5e00955..8ce87960f03 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -22,19 +22,8 @@ Boston, MA 02111-1307, USA. */
so that we do not need to conditionalize the places in Emacs
that set them. */
-#include <config.h>
-
-#ifdef USG
-# include <string.h>
-#endif
-
char *UP, *BC, PC;
-#ifdef HAVE_TERMIOS
-# include <termios.h>
- speed_t ospeed;
-#else
- short ospeed;
-#endif
+short ospeed;
static buffer[512];