Address some post-commit review comments on r217261
llvm-svn: 217276
diff --git a/libcxx/include/future b/libcxx/include/future
index 7cd88cb..83513fa 100644
--- a/libcxx/include/future
+++ b/libcxx/include/future
@@ -374,7 +374,7 @@
#pragma GCC system_header
#endif
-#ifndef _LIBCPP_HAS_NO_THREADS
+#ifdef _LIBCPP_HAS_NO_THREADS
#error <future> is not supported on this single threaded system
#else // !_LIBCPP_HAS_NO_THREADS
diff --git a/libcxx/include/ios b/libcxx/include/ios
index 6d42607..ff79998 100644
--- a/libcxx/include/ios
+++ b/libcxx/include/ios
@@ -216,7 +216,7 @@
#include <__locale>
#include <system_error>
-#if __has_feature(cxx_atomic) && !_LIBCPP_HAS_NO_THREADS
+#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
#include <atomic> // for __xindex_
#endif
@@ -367,7 +367,7 @@
int* __index_;
size_t __event_size_;
size_t __event_cap_;
-#if __has_feature(cxx_atomic) && !_LIBCPP_HAS_NO_THREADS
+#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
static atomic<int> __xindex_;
#else
static int __xindex_;
diff --git a/libcxx/src/ios.cpp b/libcxx/src/ios.cpp
index 0bd500b..06426c7 100644
--- a/libcxx/src/ios.cpp
+++ b/libcxx/src/ios.cpp
@@ -148,7 +148,7 @@
}
// xalloc
-#if __has_feature(cxx_atomic) && !_LIBCPP_HAS_NO_THREADS
+#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
atomic<int> ios_base::__xindex_ = ATOMIC_VAR_INIT(0);
#else
int ios_base::__xindex_ = 0;
diff --git a/libcxx/src/memory.cpp b/libcxx/src/memory.cpp
index 31e823c..c56d031 100644
--- a/libcxx/src/memory.cpp
+++ b/libcxx/src/memory.cpp
@@ -121,7 +121,7 @@
#endif // _LIBCPP_NO_RTTI
-#if __has_feature(cxx_atomic) && !_LIBCPP_HAS_NO_THREADS
+#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
static const std::size_t __sp_mut_count = 16;
static pthread_mutex_t mut_back_imp[__sp_mut_count] =
