jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MFC r288961,r288962:

Browse Source 
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.
This commit is contained in:
Enji Cooper 2016-01-06 20:27:55 +00:00
parent 8b23743ff0
commit 3aa268856a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/10/; revision=293270
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/sys/kern/ptrace_test.c
View File

@ -1017,7 +1017,7 @@ ATF_TC_BODY(ptrace__new_child_pl_syscall_code_thread, tc)
{
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_code_thread, tc)
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_code_thread, tc)
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;