From 429f4d134cb7c88a5922acb544e1921d257e6393 Mon Sep 17 00:00:00 2001
From: John Birrell <jb@FreeBSD.org>
Date: Fri, 15 May 1998 09:26:28 +0000
Subject: [PATCH] Change the name of a variable from _start to s_start. On
 alpha there must be a library function called _start.

---
 usr.bin/vgrind/extern.h    | 2 +-
 usr.bin/vgrind/regexp.c    | 6 +++---
 usr.bin/vgrind/vfontedpr.c | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index 0526d56e2614..946bcd551ee7 100644
--- a/usr.bin/vgrind/extern.h
+++ b/usr.bin/vgrind/extern.h
@@ -37,7 +37,7 @@
 typedef int boolean;
 
 extern boolean	 _escaped;             /* if last character was an escape */
-extern char    *_start;                /* start of the current string */
+extern char    *s_start;               /* start of the current string */
 extern char    *l_acmbeg;              /* string introducing a comment */
 extern char    *l_acmend;              /* string ending a comment */
 extern char    *l_blkbeg;              /* string begining of a block */
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index d606620c3af2..476a548e3ba4 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)regexp.c	8.1 (Berkeley) 6/6/93";
 static void	expconv __P((void));
 
 boolean	 _escaped;	/* true if we are currently _escaped */
-char	*_start;	/* start of string */
+char	*s_start;	/* start of string */
 boolean	 l_onecase;	/* true if upper and lower equivalent */
 
 #define makelower(c) (isupper((c)) ? tolower((c)) : (c))
@@ -514,7 +514,7 @@ expmatch (s, re, mstring)
 		ptr = s;
 		while (*s == ' ' || *s == '\t')
 		    s++;
-		if (s != ptr || s == _start) {
+		if (s != ptr || s == s_start) {
 
 		    /* match, be happy */
 		    matched = 1;
@@ -566,7 +566,7 @@ expmatch (s, re, mstring)
 
 	    /* check for start of line */
 	    case '^':
-		if (s == _start) {
+		if (s == s_start) {
 
 		    /* match, be happy */
 		    matched = 1;
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 7ba7da9a7932..8b5102aef366 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vfontedpr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: vfontedpr.c,v 1.9 1997/08/26 11:08:24 charnier Exp $";
+	"$Id: vfontedpr.c,v 1.10 1997/09/18 14:07:33 phk Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -366,7 +366,7 @@ putScp(os)
     char *blkeptr;			/* end of a lexical block end */
     char *nocomptr;			/* end of a non-comment delimiter */
 
-    _start = os;			/* remember the start for expmatch */
+    s_start = os;			/* remember the start for expmatch */
     _escaped = FALSE;
     if (nokeyw || incomm || instr)
 	goto skip;
@@ -572,14 +572,14 @@ putKcp (start, end, force)
 	if (*start == '\t') {
 	    while (*start == '\t')
 		start++;
-	    i = tabs(_start, start) - margin / 8;
+	    i = tabs(s_start, start) - margin / 8;
 	    printf("\\h'|%dn'", i * 10 + 1 - margin % 8);
 	    continue;
 	}
 
 	if (!nokeyw && !force)
 	    if ((*start == '#' || isidchr(*start))
-	    && (start == _start || !isidchr(start[-1]))) {
+	    && (start == s_start || !isidchr(start[-1]))) {
 		i = iskw(start);
 		if (i > 0) {
 		    ps("\\*(+K");