Cleaned up message_id().

[mmh] / uip / termsbr.c

diff --git a/uip/termsbr.c b/uip/termsbr.c
index 92f7a0e..fa33fac 100644 (file)
--- a/uip/termsbr.c
+++ b/uip/termsbr.c
@@ -11,8 +11,13 @@
 
 #include <termios.h>
 
+/* It might be better to tie this to the termcap_curses_order in
+   configure.ac.  It would be fine to check for ncurses/termcap.h
+   first on Linux, it's a symlink to termcap.h.  */
 #ifdef HAVE_TERMCAP_H
 # include <termcap.h>
+#elif defined (HAVE_NCURSES_TERMCAP_H)
+# include <ncurses/termcap.h>
 #endif
 
 /* <sys/ioctl.h> is need anyway for ioctl()
@@ -34,20 +39,6 @@
 # define TXTSIZ BUFSIZ
 #endif
 
-/*
- * These variables are sometimes defined in,
- * and needed by the termcap library.
- */
-#ifdef HAVE_OSPEED
-# ifdef MUST_DEFINE_OSPEED
-extern short ospeed;
-extern char PC;
-# endif
-#else
-short ospeed;
-char PC;
-#endif
-
 static long speedcode;
 
 static int initLI = 0;
@@ -66,7 +57,7 @@ static char termcap[TXTSIZ];
 static void
 read_termcap(void)
 {
-    char *bp, *cp;
+    char *cp;
     char *term;
 
 #ifndef TGETENT_ACCEPTS_NULL
@@ -104,8 +95,6 @@ read_termcap(void)
 
     cp = termcap;
     CL = tgetstr ("cl", &cp);
-    if ((bp = tgetstr ("pc", &cp)))
-       PC = *bp;
     if (tgetnum ("sg") <= 0) {
        SE = tgetstr ("se", &cp);
        SO = tgetstr ("so", &cp);