From 276c18aafcbbd37c4ff7e4e3af6c9a1b20090278 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 18 Nov 2015 15:21:51 -0500
Subject: [PATCH] Bug 1198458 Unbreak build on BSDs by fixing non-POSIX thread
 includes/usage. r=jesup on a CLOSED TREE

---
 CLOBBER                                               |  2 +-
 media/webrtc/trunk/webrtc/base/thread_checker_impl.cc |  8 ++++++++
 .../webrtc/system_wrappers/source/thread_posix.cc     | 11 ++---------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CLOBBER b/CLOBBER
index 373712a2e1b..52839108ffb 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1210211 Fix build failures on OpenBSD caused by new XPIDL interface.
+Bug 1198458 Fix failures in TaskCluster builds due to analog_agc.cc moving
diff --git a/media/webrtc/trunk/webrtc/base/thread_checker_impl.cc b/media/webrtc/trunk/webrtc/base/thread_checker_impl.cc
index d16ab7ae0de..75ceb3646d0 100644
--- a/media/webrtc/trunk/webrtc/base/thread_checker_impl.cc
+++ b/media/webrtc/trunk/webrtc/base/thread_checker_impl.cc
@@ -18,6 +18,14 @@
 #include <sys/syscall.h>
 #endif
 
+#if defined(__NetBSD__)
+#include <lwp.h>
+#elif defined(__FreeBSD__)
+#include <sys/param.h>
+#include <sys/thr.h>
+#include <pthread_np.h>
+#endif
+
 namespace rtc {
 
 PlatformThreadId CurrentThreadId() {
diff --git a/media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc b/media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc
index 0b391f9c198..5ed77e87e68 100644
--- a/media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc
+++ b/media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc
@@ -22,13 +22,6 @@
 #include <sys/types.h>
 #endif
 
-#if defined(__NetBSD__)
-#include <lwp.h>
-#elif defined(__FreeBSD__)
-#include <sys/param.h>
-#include <sys/thr.h>
-#endif
-
 #if defined(WEBRTC_BSD) && !defined(__NetBSD__)
 #include <pthread_np.h>
 #endif
@@ -166,9 +159,9 @@ void ThreadPosix::Run() {
 #if (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK))
     prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name_.c_str()));
 #elif defined(__NetBSD__)
-    pthread_setname_np(pthread_self(), "%s", (void *)name_);
+    pthread_setname_np(pthread_self(), "%s", (void *)name_.c_str());
 #elif defined(WEBRTC_BSD)
-    pthread_set_name_np(pthread_self(), name_);
+    pthread_set_name_np(pthread_self(), name_.c_str());
 #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
     pthread_setname_np(name_.substr(0, 63).c_str());
 #endif