From owner-svn-src-all@freebsd.org  Tue Oct  6 22:54:05 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 796E49D12B6;
 Tue,  6 Oct 2015 22:54:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4722D1768;
 Tue,  6 Oct 2015 22:54:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t96Ms4sD069268;
 Tue, 6 Oct 2015 22:54:04 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t96Ms4fb069267;
 Tue, 6 Oct 2015 22:54:04 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201510062254.t96Ms4fb069267@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 6 Oct 2015 22:54:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288961 - head/tests/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2015 22:54:05 -0000

Author: bdrewery
Date: Tue Oct  6 22:54:04 2015
New Revision: 288961
URL: https://svnweb.freebsd.org/changeset/base/288961

Log:
  Fix build with older GCC which, doesn't like 'main' being a variable name.

Modified:
  head/tests/sys/kern/ptrace_test.c

Modified: head/tests/sys/kern/ptrace_test.c
==============================================================================
--- head/tests/sys/kern/ptrace_test.c	Tue Oct  6 22:49:25 2015	(r288960)
+++ head/tests/sys/kern/ptrace_test.c	Tue Oct  6 22:54:04 2015	(r288961)
@@ -1103,7 +1103,7 @@ ATF_TC_BODY(ptrace__new_child_pl_syscall
 {
 	struct ptrace_lwpinfo pl;
 	pid_t fpid, wpid;
-	lwpid_t main;
+	lwpid_t mainpid;
 	int status;
 
 	ATF_REQUIRE((fpid = fork()) != -1);
@@ -1126,7 +1126,7 @@ ATF_TC_BODY(ptrace__new_child_pl_syscall
 
 	ATF_REQUIRE(ptrace(PT_LWPINFO, wpid, (caddr_t)&pl,
 	    sizeof(pl)) != -1);
-	main = pl.pl_lwpid;
+	mainpid = pl.pl_lwpid;
 
 	/*
 	 * Continue the child ignoring the SIGSTOP and tracing all
@@ -1151,7 +1151,7 @@ ATF_TC_BODY(ptrace__new_child_pl_syscall
 		    sizeof(pl)) != -1);
 		ATF_REQUIRE((pl.pl_flags & PL_FLAG_SCX) != 0);
 		ATF_REQUIRE(pl.pl_syscall_code != 0);
-		if (pl.pl_lwpid != main)
+		if (pl.pl_lwpid != mainpid)
 			/* New thread seen. */
 			break;