--- pr/include/md/_freebsd.h.orig	2015-10-16 13:22:19 UTC
+++ pr/include/md/_freebsd.h
@@ -57,6 +57,14 @@
 #define _PR_HAVE_LARGE_OFF_T
 
 #if defined(_PR_PTHREADS)
+#if __FreeBSD_version >= 602000
+#define _PR_HAVE_GETPROTO_R
+#define _PR_HAVE_5_ARG_GETPROTO_R
+#endif
+#if __FreeBSD_version >= 700016
+#define _PR_HAVE_GETHOST_R
+#define _PR_HAVE_GETHOST_R_INT
+#endif
 #if __FreeBSD_version >= 400008
 /*
  * libc_r before this version of FreeBSD doesn't have poll().
--- pr/src/misc/prnetdb.c.orig	2015-10-16 13:22:19 UTC
+++ pr/src/misc/prnetdb.c
@@ -78,11 +78,6 @@ PRLock *_pr_dnsLock = NULL;
 #define _PR_HAVE_GETPROTO_R_INT
 #endif
 
-#if __FreeBSD_version >= 602000
-#define _PR_HAVE_GETPROTO_R
-#define _PR_HAVE_5_ARG_GETPROTO_R
-#endif
-
 /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */
 #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS))
 #define _PR_HAVE_GETPROTO_R