Mechanically replace #if defined(__FreeBSD__) and #if defined(__NetBSD__) with

their #ifdef equivalents for everything changed in contrib/netbsd-tests. There
are some items from the vendor tree that use #if defined(__FreeBSD__) or
#if defined(__NetBSD__) which are being left alone

Requested by: bde, rpaulo
Sponsored by: EMC / Isilon Storage Division

10 files changed, 25 insertions, 25 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 e998249..5bbf337 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
@@ -31,7 +31,7 @@
  */
 
 
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 #include <sys/stat.h>
 #endif
 #include <atf-c.h>
@@ -251,7 +251,7 @@ ATF_TC_BODY(t_spawn_open_nonexistent, tc)
 	posix_spawn_file_actions_destroy(&fa);
 }
 
-#if defined(__NetBSD__)
+#ifdef __NetBSD__
 ATF_TC(t_spawn_open_nonexistent_diag);
 
 ATF_TC_HEAD(t_spawn_open_nonexistent_diag, tc)
@@ -381,7 +381,7 @@ ATF_TP_ADD_TCS(tp)
 {
 	ATF_TP_ADD_TC(tp, t_spawn_fileactions);
 	ATF_TP_ADD_TC(tp, t_spawn_open_nonexistent);
-#if defined(__NetBSD__)
+#ifdef __NetBSD__
 	ATF_TP_ADD_TC(tp, t_spawn_open_nonexistent_diag);
 #endif
 	ATF_TP_ADD_TC(tp, t_spawn_reopen);
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c b/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c
index bb3baf0..1f39984 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c
@@ -56,7 +56,7 @@ ATF_TC_BODY(getcwd_err, tc)
 	ATF_REQUIRE(getcwd(buf, 0) == NULL);
 	ATF_REQUIRE(errno == EINVAL);
 
-#if defined(__NetBSD__)
+#ifdef __NetBSD__
 	errno = 0;
 
 	ATF_REQUIRE(getcwd((void *)-1, sizeof(buf)) == NULL);
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_glob.c b/contrib/netbsd-tests/lib/libc/gen/t_glob.c
index 1611bfa..198148c 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_glob.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_glob.c
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: t_glob.c,v 1.3 2013/01/02 11:28:48 martin Exp $");
 #include <string.h>
 #include <errno.h>
 
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 #include "h_macros.h"
 #define	__gl_stat_t struct stat
 #define	_S_IFDIR S_IFDIR
@@ -138,7 +138,7 @@ gl_readdir(void *v)
 		dir.d_ino = dd->pos;
 		dir.d_type = f->dir ? DT_DIR : DT_REG;
 		DPRINTF(("readdir %s %d\n", dir.d_name, dir.d_type));
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 		dir.d_reclen = -1; /* Does not have _DIRENT_RECLEN */
 #else
 		dir.d_reclen = _DIRENT_RECLEN(&dir, dir.d_namlen);
@@ -223,7 +223,7 @@ run(const char *p, int flags, const char **res, size_t len)
 }
 
 
-#if !defined(__FreeBSD__)
+#ifndef __FreeBSD__
 ATF_TC(glob_star);
 ATF_TC_HEAD(glob_star, tc)
 {
@@ -272,7 +272,7 @@ ATF_TC_BODY(glob_nocheck, tc)
 
 ATF_TP_ADD_TCS(tp)
 {
-#if !defined(__FreeBSD__)
+#ifndef __FreeBSD__
 	ATF_TP_ADD_TC(tp, glob_star);
 #endif
 	ATF_TP_ADD_TC(tp, glob_star_not);
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c b/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c
index eec2d10..5836c86 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 #include <libutil.h>
 #else
 #include <util.h>
@@ -82,7 +82,7 @@ const struct hnopts {
 	/*
 	 * Truncated output.  Rev. 1.7 produces "1.0 K".
 	 */
-#if !defined(__FreeBSD__)
+#ifndef __FreeBSD__
 	{ 6, 1000, "A", HN_AUTOSCALE, HN_DECIMAL, -1, "" },
 
 	/*
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_nice.c b/contrib/netbsd-tests/lib/libc/gen/t_nice.c
index a0e912b..10b8df7 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_nice.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_nice.c
@@ -72,7 +72,7 @@ ATF_TC_BODY(nice_err, tc)
 {
 	int i;
 
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 	atf_tc_expect_fail("nice(incr) with incr < 0 fails with unprivileged "
 	   "users and sets errno == EPERM; see PR # 189821 for more details");
 #endif
@@ -98,7 +98,7 @@ ATF_TC_HEAD(nice_priority, tc)
 
 ATF_TC_BODY(nice_priority, tc)
 {
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 	int i, pri, pri2, nic;
 #else
 	int i, pri, nic;
@@ -115,7 +115,7 @@ ATF_TC_BODY(nice_priority, tc)
 		pri = getpriority(PRIO_PROCESS, 0);
 		ATF_REQUIRE(errno == 0);
 
-#if defined(__NetBSD__)
+#ifdef __NetBSD__
 		if (nic != pri)
 			atf_tc_fail("nice(3) and getpriority(2) conflict");
 #endif
@@ -130,14 +130,14 @@ ATF_TC_BODY(nice_priority, tc)
 		if (pid == 0) {
 
 			errno = 0;
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 			pri = getpriority(PRIO_PROCESS, 0);
 #else
 			pri2 = getpriority(PRIO_PROCESS, 0);
 #endif
 			ATF_REQUIRE(errno == 0);
 
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 			if (pri != pri2)
 #else
 			if (nic != pri)
@@ -180,7 +180,7 @@ ATF_TC_HEAD(nice_thread, tc)
 ATF_TC_BODY(nice_thread, tc)
 {
 	pthread_t tid[5];
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 	int pri, rv, val;
 #else
 	int rv, val;
@@ -196,7 +196,7 @@ ATF_TC_BODY(nice_thread, tc)
 		val = nice(i);
 		ATF_REQUIRE(val != -1);
 
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 		pri = getpriority(PRIO_PROCESS, 0);
 		rv = pthread_create(&tid[i], NULL, threadfunc, &pri);
 #else
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_raise.c b/contrib/netbsd-tests/lib/libc/gen/t_raise.c
index 120981f..d6f888f 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_raise.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_raise.c
@@ -43,7 +43,7 @@ static int	count;
 static void	handler_err(int);
 static void	handler_ret(int);
 static void	handler_stress(int);
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 static int	sig[] = { SIGALRM, SIGIO, SIGUSR1, SIGUSR2 };
 #else
 static int	sig[] = { SIGALRM, SIGIO, SIGUSR1, SIGUSR2, SIGPWR };
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c b/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c
index a93083a..f51eb2a 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c
@@ -63,7 +63,7 @@ ATF_TC_BODY(setdomainname_basic, tc)
 
 		(void)memset(name, 0, sizeof(name));
 
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 		/* 
 		 * Sanity checks to ensure that the wrong invariant isn't being
 		 * tested for per PR # 181127
@@ -101,7 +101,7 @@ ATF_TC_BODY(setdomainname_limit, tc)
 
 	(void)memset(name, 0, sizeof(name));
 
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 	ATF_REQUIRE(setdomainname(name, MAXHOSTNAMELEN - 1 ) == 0);
 	ATF_REQUIRE(setdomainname(name, MAXHOSTNAMELEN) == -1);
 #endif
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c b/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
index 6dc7953..9c9a3c7 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c
@@ -28,7 +28,7 @@
 
 #include <atf-c.h>
 
-#if defined(__NetBSD__)
+#ifdef __NetBSD__
 #include <sys/inttypes.h>
 #endif
 #include <sys/resource.h>
@@ -87,7 +87,7 @@ sig_debug(int signo, siginfo_t *info, ucontext_t *ctx)
 		printf("uc_stack %p %lu 0x%x\n", ctx->uc_stack.ss_sp,
 		    (unsigned long)ctx->uc_stack.ss_size,
 		    ctx->uc_stack.ss_flags);
-#if defined(__NetBSD__)
+#ifdef __NetBSD__
 		for (i = 0; i < __arraycount(ctx->uc_mcontext.__gregs); i++)
 			printf("uc_mcontext.greg[%d] 0x%lx\n", i,
 			    (long)ctx->uc_mcontext.__gregs[i]);
@@ -144,7 +144,7 @@ sigchild_action(int signo, siginfo_t *info, void *ptr)
 		printf("si_uid=%d\n", info->si_uid);
 		printf("si_pid=%d\n", info->si_pid);
 		printf("si_status=%d\n", info->si_status);
-#if defined(__NetBSD__)
+#ifdef __NetBSD__
 		printf("si_utime=%lu\n", (unsigned long int)info->si_utime);
 		printf("si_stime=%lu\n", (unsigned long int)info->si_stime);
 #endif
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_time.c b/contrib/netbsd-tests/lib/libc/gen/t_time.c
index 21e625f..790f3ca 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_time.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_time.c
@@ -31,7 +31,7 @@
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: t_time.c,v 1.2 2011/11/11 05:03:38 jruoho Exp $");
 
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 #include <sys/time.h>
 #endif
 #include <atf-c.h>
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c b/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
index 80f5c17..bb9d264 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
@@ -107,7 +107,7 @@ ATF_TC_BODY(ttyname_r_err, tc)
 		ATF_REQUIRE(rv == ERANGE);
 	}
 
-#if defined(__FreeBSD__)
+#ifdef __FreeBSD__
 	atf_tc_expect_fail("FreeBSD returns ENOTTY instead of EBADF; see bin/191936");
 #endif
 	rv = ttyname_r(-1, buf, ttymax);