$NetBSD: patch-ad,v 1.7 2004/07/04 23:17:59 wiz Exp $

--- info/terminal.c.orig	2004-03-27 16:35:55.000000000 +0100
+++ info/terminal.c
@@ -31,13 +31,17 @@
 #ifdef HAVE_NCURSES_TERMCAP_H
 #include <ncurses/termcap.h>
 #else
-#ifdef HAVE_TERMCAP_H
+#if defined(HAVE_TERMCAP_H) && !defined(__NetBSD__)
 #include <termcap.h>
 #else
 /* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
    Unfortunately, PC is a global variable used by the termcap library. */
 #undef PC
 
+#if defined(__NetBSD__)
+#include <termcap.h>
+#endif
+
 /* Termcap requires these variables, whether we access them or not. */
 char *BC, *UP;
 char PC;      /* Pad character */
@@ -112,11 +116,17 @@ static char *term_invend;
 /* Although I can't find any documentation that says this is supposed to
    return its argument, all the code I've looked at (termutils, less)
    does so, so fine.  */
+#ifdef __NetBSD__
+static void
+#else
 static int
+#endif
 output_character_function (int c)
 {
   putc (c, stdout);
+#ifndef __NetBSD__
   return c;
+#endif
 }
 
 /* Macro to send STRING to the terminal. */