From ec86960f3c38245b2de656e0edd0d27e169d254b Mon Sep 17 00:00:00 2001
From: David Major <dmajor@mozilla.com>
Date: Mon, 20 Jul 2015 17:04:46 -0400
Subject: [PATCH] Bug 1185686: Fix Atomics.h ifdefs for clang-cl. r=froydnj

---
 mfbt/Atomics.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mfbt/Atomics.h b/mfbt/Atomics.h
index 33610144eda2..0cae8170eafc 100644
--- a/mfbt/Atomics.h
+++ b/mfbt/Atomics.h
@@ -28,7 +28,9 @@
  * does not have <atomic>.  So be sure to check for <atomic> 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
     * loose typing of the atomic builtins. GCC 4.5 and 4.6 lacks inline
@@ -42,8 +44,6 @@
 #  elif MOZ_USING_LIBCXX && defined(__clang__)
 #    define MOZ_HAVE_CXX11_ATOMICS
 #  endif
-#elif defined(_MSC_VER)
-#  define MOZ_HAVE_CXX11_ATOMICS
 #endif
 
 namespace mozilla {