--- a/src/terminfo.c	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/terminfo.c	Mon Aug 13 11:13:30 2007 +0200
@@ -65,14 +65,14 @@
 extern void *xmalloc (int size);
 
 #if 0 /* If this isn't declared somewhere, too bad */
-extern char * tparm (CONST char *string, int arg1, int arg2, int arg3,
+extern char * tparm (const char *string, int arg1, int arg2, int arg3,
                      int arg4, int arg5, int arg6, int arg7, int arg8,
                      int arg9);
 #endif
 /* XEmacs: renamed this function because just tparam() conflicts with
    ncurses (We don't use this function anyway!) */
 char *
-emacs_tparam (CONST char *string, char *outstring, int len, int arg1,
+emacs_tparam (const char *string, char *outstring, int len, int arg1,
 	      int arg2, int arg3, int arg4, int arg5, int arg6, int arg7,
 	      int arg8, int arg9)
 {
@@ -81,7 +81,7 @@
   temp = (char *) tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7,
 			 arg8, arg9);
   if (outstring == 0)
-    outstring = ((char *) (xmalloc ((strlen (temp)) + 1)));
+    outstring = (char *) xmalloc (strlen (temp) + 1);
   strcpy (outstring, temp);
   return outstring;
 }