From d2f43a73e43fca898635670008fab922b068b448 Mon Sep 17 00:00:00 2001
From: "Ben \"root\" Anderson" <roothorick@gmail.com>
Date: Wed, 30 Oct 2013 00:08:19 -0500
Subject: [PATCH] LinuxThreadHelpers -> PthreadHelpers part 3

---
 src/arch/ArchHooks/ArchHooks_Unix.cpp | 2 +-
 src/archutils/Unix/Backtrace.cpp      | 2 +-
 src/archutils/Unix/SignalHandler.cpp  | 4 ++--
 src/tests/test_threads.cpp            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/arch/ArchHooks/ArchHooks_Unix.cpp b/src/arch/ArchHooks/ArchHooks_Unix.cpp
index f5e874a9c7..9f6412ebdf 100644
--- a/src/arch/ArchHooks/ArchHooks_Unix.cpp
+++ b/src/arch/ArchHooks/ArchHooks_Unix.cpp
@@ -8,7 +8,7 @@
 #include "SpecialFiles.h"
 #include "archutils/Unix/SignalHandler.h"
 #include "archutils/Unix/GetSysInfo.h"
-#include "archutils/Unix/LinuxThreadHelpers.h"
+#include "archutils/Common/PthreadHelpers.h"
 #include "archutils/Unix/EmergencyShutdown.h"
 #include "archutils/Unix/AssertionHandler.h"
 #include <unistd.h>
diff --git a/src/archutils/Unix/Backtrace.cpp b/src/archutils/Unix/Backtrace.cpp
index 60c7bc9dfc..b7245bb524 100644
--- a/src/archutils/Unix/Backtrace.cpp
+++ b/src/archutils/Unix/Backtrace.cpp
@@ -11,7 +11,7 @@
 #include <fcntl.h>
 
 #if defined(BACKTRACE_METHOD_X86_LINUX)
-#include "LinuxThreadHelpers.h"
+#include "archutils/Common/PthreadHelpers.h"
 
 static const char *itoa(unsigned n)
 {
diff --git a/src/archutils/Unix/SignalHandler.cpp b/src/archutils/Unix/SignalHandler.cpp
index 174ad0b3b1..41bcea2de6 100644
--- a/src/archutils/Unix/SignalHandler.cpp
+++ b/src/archutils/Unix/SignalHandler.cpp
@@ -4,8 +4,8 @@
 #include "SignalHandler.h"
 #include "GetSysInfo.h"
 
-#if defined(UNIX)
-#include "archutils/Unix/LinuxThreadHelpers.h"
+#if defined(HAVE_LIBPTHREAD)
+#include "archutils/Common/PthreadHelpers.h"
 #endif
 
 #include <unistd.h>
diff --git a/src/tests/test_threads.cpp b/src/tests/test_threads.cpp
index fb40c5f624..9154654da8 100644
--- a/src/tests/test_threads.cpp
+++ b/src/tests/test_threads.cpp
@@ -7,7 +7,7 @@
 #include "test_misc.h"
 
 #include <unistd.h>
-#include "archutils/Unix/LinuxThreadHelpers.h"
+#include "archutils/Common/PthreadHelpers.h"
 
 /* These are volatile, so writes to them aren't optimized. */
 volatile uint64_t g_ThreadId = (uint64_t) -1;