svn commit: r288961 - head/tests/sys/kern

Bryan Drewery bdrewery at FreeBSD.org
Tue Oct 6 22:54:05 UTC 2015


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;
 


More information about the svn-src-all mailing list