From owner-svn-src-stable-10@freebsd.org  Wed Jan  6 20:27:56 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 52D34A664C4;
 Wed,  6 Jan 2016 20:27:56 +0000 (UTC)
 (envelope-from ngie@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 24B391178;
 Wed,  6 Jan 2016 20:27:56 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u06KRtOt091295;
 Wed, 6 Jan 2016 20:27:55 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u06KRtE9091294;
 Wed, 6 Jan 2016 20:27:55 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601062027.u06KRtE9091294@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 6 Jan 2016 20:27:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r293270 - stable/10/tests/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jan 2016 20:27:56 -0000

Author: ngie
Date: Wed Jan  6 20:27:55 2016
New Revision: 293270
URL: https://svnweb.freebsd.org/changeset/base/293270

Log:
  MFC r288961,r288962:
  
  r288961 (by bdrewery):
  
  Fix build with older GCC which, doesn't like 'main' being a variable name.
  
  r288962 (by jhb):
  
  Tweak: use 'mainlwp' instead of 'mainpid' since this is a thread (LWP)
  identifier, not a pid.

Modified:
  stable/10/tests/sys/kern/ptrace_test.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tests/sys/kern/ptrace_test.c
==============================================================================
--- stable/10/tests/sys/kern/ptrace_test.c	Wed Jan  6 20:25:41 2016	(r293269)
+++ stable/10/tests/sys/kern/ptrace_test.c	Wed Jan  6 20:27:55 2016	(r293270)
@@ -1017,7 +1017,7 @@ ATF_TC_BODY(ptrace__new_child_pl_syscall
 {
 	struct ptrace_lwpinfo pl;
 	pid_t fpid, wpid;
-	lwpid_t main;
+	lwpid_t mainlwp;
 	int status;
 
 	ATF_REQUIRE((fpid = fork()) != -1);
@@ -1040,7 +1040,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;
+	mainlwp = pl.pl_lwpid;
 
 	/*
 	 * Continue the child ignoring the SIGSTOP and tracing all
@@ -1065,7 +1065,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 != mainlwp)
 			/* New thread seen. */
 			break;