X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fterminfo.c;h=ff3d9d38d58b3adc2ad29c74d0326a32ecd4e5db;hp=bbdb9da0009944207c562e48c6048a038480bd1e;hb=62c9a41dc0be325de11e1e57032d0063fe54f331;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910

diff --git a/src/terminfo.c b/src/terminfo.c
index bbdb9da..ff3d9d3 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -24,12 +24,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include <string.h>
 
-/* Define these variables that serve as global parameters to termcap,
-   so that we do not need to conditionalize the places in Emacs
-   that set them.  */
-
-char *UP, *BC, PC;
-
 /* Every little bit of this God-damned file has caused all manner
    of headaches due to inconsistent and incorrect header files
    on one system or other, and we don't currently need anything here,
@@ -48,7 +42,7 @@ char *UP, *BC, PC;
    format is different too.
 */
 
-#include CURSES_H_PATH
+#include CURSES_H_FILE
 /* Sun, in their infinite lameness, supplies (possibly) broken headers
    even under Solaris.  GCC feels it necessary to correct things by
    supplying its own headers.  Unfortunately, if you build GCC under
@@ -59,20 +53,20 @@ char *UP, *BC, PC;
    but not term.h.) However, it seems to work to just not include
    term.h under Solaris, so we try that.  KLUDGE! */
 #if !(defined (__GNUC__) && defined (SOLARIS2))
-#include TERM_H_PATH
+#include TERM_H_FILE
 #endif
 
 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 +75,7 @@ emacs_tparam (CONST char *string, char *outstring, int len, int arg1,
   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;
 }