X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/dfcf069d565c347abf3cb7cec80e6ed8432037ba..974aae61bbb8c05e0d0fc1a95b419fe596423fd8:/src/terminfo.c

diff --git a/src/terminfo.c b/src/terminfo.c
index 9267a55614..8f040d10c6 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -15,10 +15,11 @@ 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"
 
 /* Define these variables that serve as global parameters to termcap,
    so that we do not need to conditionalize the places in Emacs
@@ -26,19 +27,6 @@ Boston, MA 02111-1307, USA.  */
 
 char *UP, *BC, PC;
 
-#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
-
 /* Interface to curses/terminfo library.
    Turns out that all of the terminfo-level routines look
    like their termcap counterparts except for tparm, which replaces
@@ -50,14 +38,17 @@ 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();
 
   temp = tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   if (outstring == 0)
-    outstring = ((char *) (malloc ((strlen (temp)) + 1)));
+    outstring = ((char *) (xmalloc ((strlen (temp)) + 1)));
   strcpy (outstring, temp);
   return outstring;
 }
+
+/* arch-tag: a6f96a69-e68f-4e9d-a223-f0b0da26ead5
+   (do not change this comment) */