summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1996-07-15 21:53:24 +0000
committerKarl Heuer <kwzh@gnu.org>1996-07-15 21:53:24 +0000
commit2b2ca4f635a970346b7a7f18d82bb8d684978e08 (patch)
treef7a2a8b53db0d885f7dd89f203c0443e0cc56438
parentd163e729d008ae55e75d9c6db6b99546f7dca369 (diff)
downloademacs-2b2ca4f635a970346b7a7f18d82bb8d684978e08.tar.gz
[HAVE_TERMIOS_H]: Declare ospeed as speed_t.
-rw-r--r--src/cm.h5
-rw-r--r--src/sysdep.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/src/cm.h b/src/cm.h
index 80e945b4607..f5c8157f5e7 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -100,7 +100,12 @@ struct cm
extern struct cm Wcm; /* Terminal capabilities */
extern char PC; /* Pad character */
+#ifdef HAVE_TERMIOS_H
+# include <termios.h>
+extern speed_t ospeed;
+#else
extern short ospeed; /* Output speed (from sg_ospeed) */
+#endif
/* Shorthand */
#ifndef NoCMShortHand
diff --git a/src/sysdep.c b/src/sysdep.c
index 5baf95c92b5..cf6850c20d1 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -220,7 +220,12 @@ static int baud_convert[] =
};
#endif
-extern short ospeed;
+#ifdef HAVE_TERMIOS_H
+# include <termios.h>
+ extern speed_t ospeed;
+#else
+ extern short ospeed;
+#endif
/* The file descriptor for Emacs's input terminal.
Under Unix, this is normally zero except when using X;