===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/gnum4.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- src/usr.bin/m4/gnum4.c	2005/05/29 18:44:36	1.31
+++ src/usr.bin/m4/gnum4.c	2006/03/20 10:55:19	1.32
@@ -1,4 +1,4 @@
-/* $OpenBSD: gnum4.c,v 1.31 2005/05/29 18:44:36 espie Exp $ */
+/* $OpenBSD: gnum4.c,v 1.32 2006/03/20 10:55:19 espie Exp $ */
 
 /*
  * Copyright (c) 1999 Marc Espie
@@ -39,7 +39,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <err.h>
 #include <errno.h>
 #include <unistd.h>
 #include "mdef.h"
@@ -164,7 +163,7 @@
 
 	n = lookup(argv[2]);
 	if (n == NULL || (p = macro_getdef(n)) == NULL)
-		errx(1, "undefined macro %s", argv[2]);
+		m4errx(1, "indir: undefined macro %s.", argv[2]);
 	argv[1] = p->defn;
 	
 	eval(argv+1, argc-1, p->type, is_traced(n));
@@ -180,7 +179,7 @@
 	if (p != NULL)
 		eval(argv+1, argc-1, macro_builtin_type(p), is_traced(p));
 	else
-		errx(1, "unknown builtin %s", argv[2]);
+		m4errx(1, "unknown builtin %s.", argv[2]);
 } 
 
 
@@ -250,8 +249,7 @@
 	errbuf = xalloc(errlen, 
 	    "malloc in regerror: %lu", (unsigned long)errlen);
 	regerror(er, re, errbuf, errlen);
-	errx(1, "%s at line %lu: regular expression error: %s", 
-	    CURRENT_NAME, CURRENT_LINE, errbuf);
+	m4errx(1, "regular expression error: %s.", errbuf);
 }
 
 static void