Merge remote-tracking branch 'origin/stable/10' into develdevel

3 files changed, 13 insertions, 13 deletions

diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c
index 5bbf337..74009a8 100644
--- a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c
+++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fileactions.c,v 1.5 2012/04/09 19:42:07 martin Exp $ */
+/* $NetBSD: t_fileactions.c,v 1.6 2017/01/10 22:36:29 christos Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,10 +31,11 @@
  */
 
 
-#ifdef __FreeBSD__
-#include <sys/stat.h>
-#endif
 #include <atf-c.h>
+
+#include <sys/wait.h>
+#include <sys/stat.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,7 +43,6 @@
 #include <fcntl.h>
 #include <spawn.h>
 #include <unistd.h>
-#include <sys/wait.h>
 
 
 ATF_TC(t_spawn_openmode);
diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawn.c b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawn.c
index 178374b..12f2760 100644
--- a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawn.c
+++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_spawn.c,v 1.1 2012/02/13 21:03:08 martin Exp $ */
+/* $NetBSD: t_spawn.c,v 1.2 2014/10/18 08:33:30 snj Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -137,7 +137,7 @@ ATF_TC(t_spawn_child);
 ATF_TC_HEAD(t_spawn_child, tc)
 {
 	atf_tc_set_md_var(tc, "descr",
-	    "posix_spawn a child and get it's return code");
+	    "posix_spawn a child and get its return code");
 }
 
 ATF_TC_BODY(t_spawn_child, tc)
diff --git a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c
index 78313cd..2085b9e 100644
--- a/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c
+++ b/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawnattr.c
@@ -60,16 +60,16 @@ get_different_scheduler(void)
 
 	/* get current schedule policy */
 	scheduler = sched_getscheduler(0);
-	for (i = 0; i < nitems(schedulers); i++) {
+	for (i = 0; i < __arraycount(schedulers); i++) {
 		if (schedulers[i] == scheduler)
 			break;
 	}
-	ATF_REQUIRE_MSG(i < nitems(schedulers),
+	ATF_REQUIRE_MSG(i < __arraycount(schedulers),
 	    "Unknown current scheduler %d", scheduler);
-					
+
 	/* new scheduler */
 	i++;
-	if (i >= nitems(schedulers))
+	if (i >= __arraycount(schedulers))
 		i = 0;
 	return schedulers[i];
 }
@@ -85,7 +85,7 @@ get_different_priority(int scheduler)
 
 	sched_getparam(0, &param);
 	priority = param.sched_priority;
-	
+
 	/*
 	 * Change numerical value of the priority, to ensure that it
 	 * was set for the spawned child.
@@ -127,7 +127,7 @@ ATF_TC_BODY(t_spawnattr, tc)
 	scheduler = get_different_scheduler();
 	priority = get_different_priority(scheduler);
 	sp.sched_priority = priority;
-	
+
 	sigemptyset(&sig);
 	sigaddset(&sig, SIGUSR1);