[HAVE_LIBNCURSES]: Declare ospeed as short, unless NCURSES_OSPEED_T.

src/cm.h

@@ -101,6 +101,9 @@ struct cm
 extern struct cm Wcm;		/* Terminal capabilities */
 extern char PC;			/* Pad character */
 
+#if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T)
+extern short ospeed;
+#else
 #if defined (HAVE_TERMIOS_H) && defined (LINUX)
 #include <termios.h>
 /* HJL's version of libc is said to need this on the Alpha.
@@ -109,6 +112,7 @@ extern speed_t ospeed;
 #else
 extern short ospeed;		/* Output speed (from sg_ospeed) */
 #endif
+#endif
 
 /* Shorthand */
 #ifndef NoCMShortHand

src/sysdep.c

@@ -226,6 +226,9 @@ static int baud_convert[] =
   };
 #endif
 
+#if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T)
+extern short ospeed;
+#else
 #if defined (HAVE_TERMIOS_H) && defined (LINUX)
 #include <termios.h>
 /* HJL's version of libc is said to need this on the Alpha.
@@ -234,6 +237,7 @@ extern speed_t ospeed;
 #else
 extern short ospeed;
 #endif
+#endif
 
 /* The file descriptor for Emacs's input terminal.
    Under Unix, this is normally zero except when using X;

src/terminfo.c

@@ -26,6 +26,9 @@ Boston, MA 02111-1307, USA.  */
 
 char *UP, *BC, PC;
 
+#if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T)
+short ospeed;
+#else
 #if defined (HAVE_TERMIOS_H) && defined (LINUX)
 #include <termios.h>
 /* HJL's version of libc is said to need this on the Alpha.
@@ -34,6 +37,7 @@ speed_t ospeed;
 #else
 short ospeed;
 #endif
+#endif
 
 static buffer[512];