(calendar-mode-map): Rename `holidays' menu to `Holidays'.

[bpt/emacs.git] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index 5e0caa1..d7c5e21 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -101,7 +101,10 @@ struct cm
 extern struct cm Wcm;          /* Terminal capabilities */
 extern char PC;                        /* Pad character */
 
-#if defined (HAVE_TERMIOS_H) || defined (LINUX)
+#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.
    On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short.  */
@@ -109,6 +112,7 @@ extern speed_t ospeed;
 #else
 extern short ospeed;           /* Output speed (from sg_ospeed) */
 #endif
+#endif
 
 /* Shorthand */
 #ifndef NoCMShortHand
@@ -173,7 +177,7 @@ extern int evalcost ();
 
 extern void cmcheckmagic ();
 extern int cmputc ();
-extern int cmcostinit ();
-extern int cmgoto ();
-extern int Wcm_clear ();
+extern void cmcostinit ();
+extern void cmgoto ();
+extern void Wcm_clear ();
 extern int Wcm_init ();