(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 7f61912..d7c5e21 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Holds the minimum and maximum costs for the parametrized capabilities.  */
 struct parmcap
@@ -99,7 +100,19 @@ 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.
+   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
@@ -162,8 +175,9 @@ extern short ospeed;                /* Output speed (from sg_ospeed) */
 extern int cost;
 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 ();