diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-06 23:15:16 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-06 23:15:16 +0000 |
| commit | 72cffa558322966f5389fe9544a11a41e3858c66 (patch) | |
| tree | 54036a92d07fdd00f98625b8c861a3d8461f6c0b | |
| parent | 4282c404f95155d5685644a06b361d6b5097f432 (diff) | |
| download | bcm5719-llvm-72cffa558322966f5389fe9544a11a41e3858c66.tar.gz bcm5719-llvm-72cffa558322966f5389fe9544a11a41e3858c66.zip | |
Fix breakage caused when _LIBCPP_HAS_THREAD_API_PTHREAD is manually defined
llvm-svn: 291298
| -rw-r--r-- | libcxx/include/__config | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index 3a0e71e2e05..a05bd9228b8 100644 --- a/libcxx/include/__config +++ b/libcxx/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 |
