Bug 1185686: Fix Atomics.h ifdefs for clang-cl. r=froydnj

This commit is contained in:
David Major 2015-07-20 17:04:46 -04:00
Родитель b0d4abd2b1
Коммит ec86960f3c
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -28,7 +28,9 @@
* does not have <atomic>. So be sure to check for <atomic> support * does not have <atomic>. So be sure to check for <atomic> support
* along with C++0x support. * along with C++0x support.
*/ */
#if defined(__clang__) || defined(__GNUC__) #if defined(_MSC_VER)
# define MOZ_HAVE_CXX11_ATOMICS
#elif defined(__clang__) || defined(__GNUC__)
/* /*
* Clang doesn't like <atomic> from libstdc++ before 4.7 due to the * Clang doesn't like <atomic> from libstdc++ before 4.7 due to the
* loose typing of the atomic builtins. GCC 4.5 and 4.6 lacks inline * loose typing of the atomic builtins. GCC 4.5 and 4.6 lacks inline
@ -42,8 +44,6 @@
# elif MOZ_USING_LIBCXX && defined(__clang__) # elif MOZ_USING_LIBCXX && defined(__clang__)
# define MOZ_HAVE_CXX11_ATOMICS # define MOZ_HAVE_CXX11_ATOMICS
# endif # endif
#elif defined(_MSC_VER)
# define MOZ_HAVE_CXX11_ATOMICS
#endif #endif
namespace mozilla { namespace mozilla {