From 0634cd7fff7dcc0a4bd8b462e21a3b974396663a Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Mon, 14 Apr 2003 03:02:28 +0000
Subject: [PATCH] fix build errors

---
 usr.bin/less/less/linenum.c    | 4 ++--
 usr.bin/less/less/opttbl.c     | 3 +--
 usr.bin/less/less/search.c     | 6 +++---
 usr.bin/less/lesskey/lesskey.c | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/usr.bin/less/less/linenum.c b/usr.bin/less/less/linenum.c
index 87d439271b14..ef6c0ef67a5d 100644
--- a/usr.bin/less/less/linenum.c
+++ b/usr.bin/less/less/linenum.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linenum.c,v 1.6 2003/04/14 02:56:47 mrg Exp $	*/
+/*	$NetBSD: linenum.c,v 1.7 2003/04/14 03:02:28 mrg Exp $	*/
 
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
@@ -73,7 +73,7 @@ extern int linenums;
 extern int sigs;
 extern int sc_height;
 
-static void calcgap __P((struct linenum *));
+static void calcgap __P((struct linenum_info *));
 static void longloopmessage __P((void));
 static void longish __P((void));
 
diff --git a/usr.bin/less/less/opttbl.c b/usr.bin/less/less/opttbl.c
index b6dff3819e2c..27a2e9344ccd 100644
--- a/usr.bin/less/less/opttbl.c
+++ b/usr.bin/less/less/opttbl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: opttbl.c,v 1.9 2003/04/14 02:56:47 mrg Exp $	*/
+/*	$NetBSD: opttbl.c,v 1.10 2003/04/14 03:02:29 mrg Exp $	*/
 
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
@@ -509,7 +509,6 @@ findopt_name(p_optname, p_oname, p_err)
 	int maxlen = 0;
 	int ambig = 0;
 	int exact = 0;
-	char *eq;
 
 	/*
 	 * Check all options.
diff --git a/usr.bin/less/less/search.c b/usr.bin/less/less/search.c
index 778b97dd7545..af9cfe7b3866 100644
--- a/usr.bin/less/less/search.c
+++ b/usr.bin/less/less/search.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: search.c,v 1.7 2003/04/14 02:56:48 mrg Exp $	*/
+/*	$NetBSD: search.c,v 1.8 2003/04/14 03:02:29 mrg Exp $	*/
 
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
@@ -54,8 +54,8 @@ static void uncompile_pattern __P((void));
 static int match_pattern __P((char *, char **, char **, int));
 struct hilite;
 static void add_hilite __P((struct hilite *, struct hilite *));
-static void adj_hilite __P((struct hilite *, POSITION));
-static void hilite_line __P((POSITION, char *, char *, char *));
+static void adj_hilite __P((struct hilite *, POSITION, int));
+static void hilite_line __P((POSITION, char *, char *, char *, int));
 static void hilite_screen __P((void));
 static POSITION search_pos __P((int));
 static int search_range __P((POSITION, POSITION, int, int, int, POSITION *, POSITION *));
diff --git a/usr.bin/less/lesskey/lesskey.c b/usr.bin/less/lesskey/lesskey.c
index 9cf30f17abb5..17e5e4c7014c 100644
--- a/usr.bin/less/lesskey/lesskey.c
+++ b/usr.bin/less/lesskey/lesskey.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lesskey.c,v 1.7 2003/04/14 02:56:49 mrg Exp $	*/
+/*	$NetBSD: lesskey.c,v 1.8 2003/04/14 03:02:29 mrg Exp $	*/
 
 /*
  * Copyright (C) 1984-2002  Mark Nudelman
@@ -422,7 +422,7 @@ tstr(pp, xlate)
 				case 'e': ch = SK_END; break;
 				case 'x': ch = SK_DELETE; break;
 				default:
-					error("illegal char after \\k");
+					terror("illegal char after \\k");
 					*pp = p+1;
 					return ("");
 				}