Use <termcap.h> to define termcap interface, if available. Some

recent versions of ncurses appear to have changed the interface.

diff --git a/v7/src/microcode/tterm.c b/v7/src/microcode/tterm.c
index 125dc48a9dc83e4619e347cf235a962cd74dab11..b5d8b5a80a28f315bcd1bc104b55d7ddd1a6d4ac 100644 (file)
--- a/v7/src/microcode/tterm.c
+++ b/v7/src/microcode/tterm.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: tterm.c,v 1.6 1999/01/02 06:11:34 cph Exp $
+$Id: tterm.c,v 1.7 2001/02/28 14:41:46 cph Exp $
 
 Copyright (c) 1990-1999 Massachusetts Institute of Technology
 
@@ -25,6 +25,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "prims.h"
 #include "osterm.h"
 
+#ifdef HAVE_TERMCAP_H
+#  include <termcap.h>
+#else
+   extern char * BC;
+   extern char * UP;
+   extern char PC;
+   extern short ospeed;
+#endif
+
 extern int EXFUN (tgetent, (char *, char *));
 extern int EXFUN (tgetnum, (char *));
 extern int EXFUN (tgetflag, (char *));
@@ -32,10 +41,6 @@ extern char * EXFUN (tgetstr, (char *, char **));
 extern char * EXFUN (tparam, (char *, char*, int, int, ...));
 extern char * EXFUN (tgoto, (char *, int, int));
 extern int EXFUN (tputs, (char *, int, void (*) (int)));
-extern char * BC;
-extern char * UP;
-extern char PC;
-extern short ospeed;
 
 #ifndef TERMCAP_BUFFER_SIZE
 #define TERMCAP_BUFFER_SIZE 2048
@@ -52,7 +57,6 @@ static void
 DEFUN (tputs_write_char, (c), int c)
 {
   (*tputs_output_scan++) = c;
-  return;
 }
 \f
 DEFINE_PRIMITIVE ("TERMCAP-INITIALIZE", Prim_termcap_initialize, 1, 1, 0)