(ospeed) [HAVE_SPEED_T]: Declare as `extern speed_t'.

2 files changed, 10 insertions, 0 deletions

diff --git a/src/sysdep.c b/src/sysdep.c
index 36c204ff11a..e5e46f77cbc 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -228,6 +228,10 @@ static int baud_convert[] =
   };
 #endif
 
+#ifdef HAVE_SPEED_T
+#include <termios.h>
+extern speed_t ospeed;
+#else
 #if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T)
 extern short ospeed;
 #else
@@ -240,6 +244,7 @@ extern speed_t ospeed;
 extern short ospeed;
 #endif
 #endif
+#endif
 
 /* 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 3d021edce44..bfb8b62674a 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -27,6 +27,10 @@ Boston, MA 02111-1307, USA.  */
 
 char *UP, *BC, PC;
 
+#ifdef HAVE_SPEED_T
+#include <termios.h>
+extern speed_t ospeed;
+#else
 #if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T)
 short ospeed;
 #else
@@ -39,6 +43,7 @@ speed_t ospeed;
 short ospeed;
 #endif
 #endif
+#endif
 
 /* Interface to curses/terminfo library.
    Turns out that all of the terminfo-level routines look