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;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
