Test HAVE_TERMIOS rather than the automatically-generated HAVE_TERMIOS_H,

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

diff --git a/src/cm.h b/src/cm.h
index eef86b9..0b23bc9 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,12 @@ struct cm
 
 extern struct cm Wcm;          /* Terminal capabilities */
 extern char PC;                        /* Pad character */
+#ifdef HAVE_TERMIOS
+# include <termios.h>
+extern speed_t ospeed;
+#else
 extern short ospeed;           /* Output speed (from sg_ospeed) */
+#endif
 
 /* Shorthand */
 #ifndef NoCMShortHand
@@ -125,8 +131,8 @@ extern short ospeed;                /* Output speed (from sg_ospeed) */
 #define AutoWrap       Wcm.cm_autowrap
 #define MagicWrap      Wcm.cm_magicwrap
 #define UseTabs                Wcm.cm_usetabs
-#define ScreenRows     Wcm.cm_rows
-#define ScreenCols     Wcm.cm_cols
+#define FrameRows      Wcm.cm_rows
+#define FrameCols      Wcm.cm_cols
 
 #define UpCost         Wcm.cc_up
 #define DownCost       Wcm.cc_down
@@ -149,7 +155,7 @@ extern short ospeed;                /* Output speed (from sg_ospeed) */
 #define cmat(row,col)  (curY = (row), curX = (col))
 #define cmplus(n)                                      \
   {                                                    \
-    if ((curX += (n)) >= ScreenCols && !MagicWrap)     \
+    if ((curX += (n)) >= FrameCols && !MagicWrap)      \
       {                                                        \
        if (Wcm.cm_losewrap) losecursor ();             \
        else if (AutoWrap) curX = 0, curY++;            \
@@ -162,7 +168,8 @@ extern short ospeed;                /* Output speed (from sg_ospeed) */
 extern int cost;
 extern int evalcost ();
 
-extern void cmputc ();
+extern void cmcheckmagic ();
+extern int cmputc ();
 extern int cmcostinit ();
 extern int cmgoto ();
 extern int Wcm_clear ();