--- libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc.orig	2014-11-13 20:41:38 UTC
+++ libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
@@ -39,6 +39,10 @@
 #define va_copy(dst, src) ((dst) = (src))
 #endif // _WIN32
 
+#if SANITIZER_BSDSUNIX
+#define pthread_setname_np pthread_set_name_np
+#endif
+
 #if SANITIZER_FREEBSD
 #define pthread_setname_np pthread_set_name_np
 #endif
@@ -1548,7 +1552,7 @@ INTERCEPTOR_WITH_SUFFIX(int, wait, int *
   return res;
 }
 // On FreeBSD id_t is always 64-bit wide.
-#if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
+#if (SANITIZER_FREEBSD || SANITIZER_BSDSUNIX) && (SANITIZER_WORDSIZE == 32)
 INTERCEPTOR_WITH_SUFFIX(int, waitid, int idtype, long long id, void *infop,
                         int options) {
 #else