X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f0d21750932435a810749ddfa04f798dfd5636dc..ff6daed30415db8a1110e11f67f5d61ef02f04a5:/src/terminfo.c

diff --git a/src/terminfo.c b/src/terminfo.c
index bfb8b62674..5c0aa1ccf0 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -1,5 +1,6 @@
 /* Interface from Emacs to terminfo.
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +16,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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
 #include "lisp.h"
@@ -27,24 +28,6 @@ Boston, MA 02111-1307, USA.  */
 
 char *UP, *BC, PC;
 
-#ifdef HAVE_SPEED_T
-#include <termios.h>
-extern speed_t ospeed;
-#else
-#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.
-   On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short.  */
-speed_t ospeed;
-#else
-short ospeed;
-#endif
-#endif
-#endif
-
 /* Interface to curses/terminfo library.
    Turns out that all of the terminfo-level routines look
    like their termcap counterparts except for tparm, which replaces
@@ -56,7 +39,7 @@ char *
 tparam (string, outstring, len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
      char *string;
      char *outstring;
-     int arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9;
+     int len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9;
 {
   char *temp;
   extern char *tparm();
@@ -67,3 +50,6 @@ tparam (string, outstring, len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8,
   strcpy (outstring, temp);
   return outstring;
 }
+
+/* arch-tag: a6f96a69-e68f-4e9d-a223-f0b0da26ead5
+   (do not change this comment) */