--- libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc.orig	2020-03-04 19:30:03.000000000 +1100
+++ libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc	2020-09-15 00:06:26.086272000 +1000
@@ -60,7 +60,7 @@
 #define va_copy(dst, src) ((dst) = (src))
 #endif // _WIN32
 
-#if SANITIZER_FREEBSD
+#if SANITIZER_FREEBSD || SANITIZER_BSDSUNIX
 #define pthread_setname_np pthread_set_name_np
 #define inet_aton __inet_aton
 #define inet_pton __inet_pton
@@ -2178,7 +2178,7 @@
   return res;
 }
 // On FreeBSD id_t is always 64-bit wide.
-#if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
+#if (SANITIZER_BSDSUNIX || SANITIZER_FREEBSD) && (SANITIZER_WORDSIZE == 32)
 INTERCEPTOR_WITH_SUFFIX(int, waitid, int idtype, long long id, void *infop,
                         int options) {
 #else