[HAVE_TERMIOS_H]: Declare ospeed as speed_t.

diff --git a/src/cm.h b/src/cm.h
index 80e945b46073adcd91a78e9ad9dd941d1893c1ed..f5c8157f5e7c3b5170444f5da2b1a748750154c2 100644 (file)
--- 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 5baf95c92b5a46581851947250d40bf36c9d4bc9..cf6850c20d19fa12ad9700e0f3f6806f289538ec 100644 (file)
--- 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;