llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-24 12:02:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix breakage caused when _LIBCPP_HAS_THREAD_API_PTHREAD is manually defined

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291298 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-01-06 23:15:16 +00:00
parent 5170d7d88f
commit 1572c468b3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/__config
View File

@@ -894,7 +894,8 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
#endif #endif
// Thread API // Thread API
#if !defined(_LIBCPP_HAS_NO_THREADS) #if !defined(_LIBCPP_HAS_NO_THREADS) && \
!defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
# if defined(__FreeBSD__) || \ # if defined(__FreeBSD__) || \
defined(__Fuchsia__) || \ defined(__Fuchsia__) || \
defined(__NetBSD__) || \ defined(__NetBSD__) || \
@@ -902,9 +903,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
defined(__APPLE__) || \ defined(__APPLE__) || \
defined(__CloudABI__) || \ defined(__CloudABI__) || \
defined(__sun__) defined(__sun__)
# ifndef _LIBCPP_HAS_THREAD_API_PTHREAD # define _LIBCPP_HAS_THREAD_API_PTHREAD
# define _LIBCPP_HAS_THREAD_API_PTHREAD
# endif
# else # else
# error "No thread API" # error "No thread API"
# endif // _LIBCPP_HAS_THREAD_API # endif // _LIBCPP_HAS_THREAD_API