From owner-svn-src-all@FreeBSD.ORG  Thu Aug  7 14:26:44 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D21DD1CE
 for <svn-src-all@freebsd.org>; Thu,  7 Aug 2014 14:26:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A4F1420AE
 for <svn-src-all@freebsd.org>; Thu,  7 Aug 2014 14:26:44 +0000 (UTC)
Received: from jmmv (uid 1331) (envelope-from jmmv@FreeBSD.org) id 52a0
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Thu, 07 Aug 2014 14:26:44 +0000
From: Julio Merino <jmmv@FreeBSD.org>
Date: Thu, 7 Aug 2014 14:26:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269665 - head/usr.bin/m4
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e38ca4.52a0.5778d22b@svn.freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Aug 2014 14:26:44 -0000

Author: jmmv
Date: Thu Aug  7 14:26:44 2014
New Revision: 269665
URL: http://svnweb.freebsd.org/changeset/base/269665

Log:
  Avoid name shadowing to fix build under powerpc64.
  
  Error was:
  
  cc1: warnings being treated as errors
  .../usr.bin/m4/misc.c: In function 'm4errx':
  .../usr.bin/m4/misc.c:268: warning: declaration of 'eval' shadows a global declaration
  .../usr.bin/m4/extern.h:40: warning: shadowed declaration is here

Modified:
  head/usr.bin/m4/misc.c

Modified: head/usr.bin/m4/misc.c
==============================================================================
--- head/usr.bin/m4/misc.c	Thu Aug  7 12:47:25 2014	(r269664)
+++ head/usr.bin/m4/misc.c	Thu Aug  7 14:26:44 2014	(r269665)
@@ -265,7 +265,7 @@ killdiv(void)
 extern char *__progname;
 
 void
-m4errx(int eval, const char *fmt, ...)
+m4errx(int exitstatus, const char *fmt, ...)
 {
 	fprintf(stderr, "%s: ", __progname);
 	fprintf(stderr, "%s at line %lu: ", CURRENT_NAME, CURRENT_LINE);
@@ -277,7 +277,7 @@ m4errx(int eval, const char *fmt, ...)
 		va_end(ap);
 	}
 	fprintf(stderr, "\n");
-	exit(eval);
+	exit(exitstatus);
 }
 
 /*