(face-valid-attribute-values): Make sure directories we search for

[bpt/emacs.git] / src / terminfo.c

diff --git a/src/terminfo.c b/src/terminfo.c
index 9267a55..eed22af 100644 (file)
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -19,6 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, 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,6 +27,10 @@ Boston, MA 02111-1307, USA.  */
 
 char *UP, *BC, PC;
 
+#ifdef HAVE_SPEED_T
+#include <termios.h>
+speed_t ospeed;
+#else
 #if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T)
 short ospeed;
 #else
@@ -38,6 +43,7 @@ speed_t ospeed;
 short ospeed;
 #endif
 #endif
+#endif
 
 /* Interface to curses/terminfo library.
    Turns out that all of the terminfo-level routines look
@@ -57,7 +63,7 @@ tparam (string, outstring, len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8,
 
   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;
 }