Author: ericwf
Date: Fri Jan 6 17:15:16 2017
New Revision: 291298
URL: http://llvm.org/viewvc/llvm-project?rev=291298&view=rev
Log:
Fix breakage caused when _LIBCPP_HAS_THREAD_API_PTHREAD is manually defined
Modified:
libcxx/trunk/include/__config
Modified: libcxx/trunk/include/__config
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=291298&r1=291297&r2=291298&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Fri Jan 6 17:15:16 2017
@@ -894,7 +894,8 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit
#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 __sanit
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
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
