From 1572c468b3d1a6cc096ba802c69bcc7decc87adc Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Fri, 6 Jan 2017 23:15:16 +0000
Subject: [PATCH] Fix breakage caused when _LIBCPP_HAS_THREAD_API_PTHREAD is
 manually defined

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291298 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/__config | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/__config b/include/__config
index 3a0e71e2e..a05bd9228 100644
--- a/include/__config
+++ b/include/__config
@@ -894,7 +894,8 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
 #endif
 
 // Thread API
-#if !defined(_LIBCPP_HAS_NO_THREADS)
+#if !defined(_LIBCPP_HAS_NO_THREADS) && \
+    !defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
 # if defined(__FreeBSD__) || \
     defined(__Fuchsia__) || \
     defined(__NetBSD__) || \
@@ -902,9 +903,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
     defined(__APPLE__) || \
     defined(__CloudABI__) || \
     defined(__sun__)
-#   ifndef _LIBCPP_HAS_THREAD_API_PTHREAD
-#     define _LIBCPP_HAS_THREAD_API_PTHREAD
-#   endif
+#   define _LIBCPP_HAS_THREAD_API_PTHREAD
 # else
 #  error "No thread API"
 # endif // _LIBCPP_HAS_THREAD_API