From 1f6a3aa8e5f12b513d463803677a97a099f4cea9 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Sat, 14 Jan 2017 10:08:22 +0000
Subject: [PATCH] Fix the build using hunks pending upstream contributions

---
 contrib/netbsd-tests/lib/libc/sys/t_msync.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/netbsd-tests/lib/libc/sys/t_msync.c b/contrib/netbsd-tests/lib/libc/sys/t_msync.c
index e627614c067d..864df02d7bbf 100644
--- a/contrib/netbsd-tests/lib/libc/sys/t_msync.c
+++ b/contrib/netbsd-tests/lib/libc/sys/t_msync.c
@@ -52,8 +52,12 @@ msync_sync(const char *garbage, int flags)
 {
 	char *buf, *map = MAP_FAILED;
 	const char *str = NULL;
+#ifdef __FreeBSD__
+	size_t len;
+#else
 	size_t i, len;
 	ssize_t tot;
+#endif
 	int fd, rv;
 
 	/*