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

diff --git a/src/cm.h b/src/cm.h
index 4567c4474a9fa68d826294e4d9539258fc50503f..fc3d183f5f915aa98701b0221d7ad69d3c09aadd 100644 (file)
--- a/src/cm.h
+++ b/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

diff --git a/src/sysdep.c b/src/sysdep.c
index a72d1977dd30bee767b496b5c1e61f769d975199..098612a1bb563e62b846f94541db3664f825d0b2 100644 (file)
--- a/src/sysdep.c
+++ b/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;

diff --git a/src/terminfo.c b/src/terminfo.c
index 870461f5a04164e622c1d82b9f29efacfcd65bb5..4bb47997507395732751e9a694214a932eaa30f2 100644 (file)
--- a/src/terminfo.c
+++ b/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];