6 files changed, 24 insertions, 0 deletions

diff --git a/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c b/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c
index 5908547693c5..19c7b02ea325 100644
--- a/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c
+++ b/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c
@@ -78,7 +78,11 @@ ATF_TC_BODY(fifo, tc)
 	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
 
 	(void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, "
+#ifdef __FreeBSD__
+	    "data: %" PRIdPTR "\n", n, event[0].filter, event[0].flags,
+#else
 	    "data: %" PRId64 "\n", n, event[0].filter, event[0].flags,
+#endif
 	    event[0].fflags, event[0].data);
 
 	ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ);
diff --git a/contrib/netbsd-tests/kernel/kqueue/read/t_file.c b/contrib/netbsd-tests/kernel/kqueue/read/t_file.c
index 233517297964..80479afc7f7e 100644
--- a/contrib/netbsd-tests/kernel/kqueue/read/t_file.c
+++ b/contrib/netbsd-tests/kernel/kqueue/read/t_file.c
@@ -111,7 +111,11 @@ ATF_TC_BODY(file, tc)
 		num += n;
 
 		(void)printf("kevent num %d flags: %#x, fflags: %#x, data: "
+#ifdef __FreeBSD__
+		    "%" PRIdPTR "\n", n, event[0].flags, event[0].fflags,
+#else
 		    "%" PRId64 "\n", n, event[0].flags, event[0].fflags,
+#endif
 		    event[0].data);
 
 		if (event[0].data < 0)
diff --git a/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c b/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c
index d8e05f262e38..2cdd0159341c 100644
--- a/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c
+++ b/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c
@@ -67,7 +67,11 @@ ATF_TC_BODY(pipe, tc)
 
 	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
 	(void)printf("kevent num %d flags: %#x, fflags: %#x, data: "
+#ifdef __FreeBSD__
+	    "%" PRIdPTR "\n", n, event[0].flags, event[0].fflags, event[0].data);
+#else
 	    "%" PRId64 "\n", n, event[0].flags, event[0].fflags, event[0].data);
+#endif
 
 	RL(n = read(fds[0], buffer, event[0].data));
 	buffer[n] = '\0';
diff --git a/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c b/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c
index 3a42fd3927fb..57ccf9256251 100644
--- a/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c
+++ b/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c
@@ -103,7 +103,11 @@ h_check(bool check_master)
 	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
 
 	(void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, "
+#ifdef __FreeBSD__
+	    "data: %" PRIdPTR "\n", n, event[0].filter, event[0].flags,
+#else
 	    "data: %" PRId64 "\n", n, event[0].filter, event[0].flags,
+#endif
 	    event[0].fflags, event[0].data);
 
 	ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ);
diff --git a/contrib/netbsd-tests/kernel/kqueue/t_proc1.c b/contrib/netbsd-tests/kernel/kqueue/t_proc1.c
index 07d5a3c0279d..aa806ba1a8fa 100644
--- a/contrib/netbsd-tests/kernel/kqueue/t_proc1.c
+++ b/contrib/netbsd-tests/kernel/kqueue/t_proc1.c
@@ -139,7 +139,11 @@ ATF_TC_BODY(proc1, tc)
 			printf(" NOTE_FORK");
 		}
 		if (event[0].fflags & NOTE_CHILD)
+#ifdef __FreeBSD__
+			printf(" NOTE_CHILD, parent = %" PRIdPTR, event[0].data);
+#else
 			printf(" NOTE_CHILD, parent = %" PRId64, event[0].data);
+#endif
 
 		printf("\n");
 	}
diff --git a/contrib/netbsd-tests/kernel/kqueue/t_sig.c b/contrib/netbsd-tests/kernel/kqueue/t_sig.c
index 8726fe98bb7e..ebbd76ec8873 100644
--- a/contrib/netbsd-tests/kernel/kqueue/t_sig.c
+++ b/contrib/netbsd-tests/kernel/kqueue/t_sig.c
@@ -130,7 +130,11 @@ ATF_TC_BODY(sig, tc)
 		if (n == 0)
 			continue;
 
+#ifdef __FreeBSD__
+		(void)printf("sig: kevent flags: 0x%x, data: %" PRIdPTR " (# "
+#else
 		(void)printf("sig: kevent flags: 0x%x, data: %" PRId64 " (# "
+#endif
 		    "times signal posted)\n", event[0].flags, event[0].data);
 	}