ofp-actions: Assert variable actions have len>0.

[cascardo/ovs.git] / lib / ovs-atomic.h

diff --git a/lib/ovs-atomic.h b/lib/ovs-atomic.h
index 0f52c5f..b38c9ef 100644 (file)
--- a/lib/ovs-atomic.h
+++ b/lib/ovs-atomic.h
@@ -121,7 +121,7 @@
  *        operation (atomic_read_explicit, or a load operation preceding a
  *        atomic_thread_fence) will not be moved prior to the consume
  *        barrier.  Non-data-dependent loads and stores can be reordered to
- *        happen before the the consume barrier.
+ *        happen before the consume barrier.
  *
  *        RCU is the prime example of the use of the consume barrier: The
  *        consume barrier guarantees that reads from a RCU protected object
@@ -321,10 +321,10 @@
     #if __CHECKER__
         /* sparse doesn't understand some GCC extensions we use. */
         #include "ovs-atomic-pthreads.h"
-    #elif HAVE_STDATOMIC_H
-        #include "ovs-atomic-c11.h"
     #elif __has_extension(c_atomic)
         #include "ovs-atomic-clang.h"
+    #elif HAVE_STDATOMIC_H
+        #include "ovs-atomic-c11.h"
     #elif __GNUC__ >= 4 && __GNUC_MINOR__ >= 7
         #include "ovs-atomic-gcc4.7+.h"
     #elif __GNUC__ && defined(__x86_64__)
@@ -333,6 +333,8 @@
         #include "ovs-atomic-i586.h"
     #elif HAVE_GCC4_ATOMICS
         #include "ovs-atomic-gcc4+.h"
+    #elif _MSC_VER && _M_IX86 >= 500
+        #include "ovs-atomic-msvc.h"
     #else
         /* ovs-atomic-pthreads implementation is provided for portability.
          * It might be too slow for real use because Open vSwitch is