(record_unwind_protect): Protoize parameter.

[gnu-emacs] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index 652b61eb216b45bfcc310fbc7d91ccf21b6af460..fc3d183f5f915aa98701b0221d7ad69d3c09aadd 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -100,13 +100,19 @@ struct cm
 
 extern struct cm Wcm;          /* Terminal capabilities */
 extern char PC;                        /* Pad character */
-#ifdef HAVE_TERMIOS_H
+
+#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.  */
+/* HJL's version of libc is said to need this on the Alpha.
+   On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short.  */
 extern speed_t ospeed;
 #else
 extern short ospeed;           /* Output speed (from sg_ospeed) */
 #endif
+#endif
 
 /* Shorthand */
 #ifndef NoCMShortHand