Merge branch 'mainstream'

[sliver-openvswitch.git] / lib / ovs-atomic.h

diff --git a/lib/ovs-atomic.h b/lib/ovs-atomic.h
index a0a34f3..3467f11 100644 (file)
--- a/lib/ovs-atomic.h
+++ b/lib/ovs-atomic.h
@@ -21,7 +21,7 @@
  *
  * This library implements atomic operations with an API based on the one
  * defined in C11.  It includes multiple implementations for compilers and
- * libraries with varying degrees of built-in support for C11, including an
+ * libraries with varying degrees of built-in support for C11, including a
  * fallback implementation for systems that have pthreads but no other support
  * for atomics.
  *
@@ -240,7 +240,7 @@
         #include "ovs-atomic-c11.h"
     #elif __GNUC__ >= 4 && __GNUC_MINOR__ >= 7
         #include "ovs-atomic-gcc4.7+.h"
-    #elif __GNUC__ >= 4
+    #elif HAVE_GCC4_ATOMICS
         #include "ovs-atomic-gcc4+.h"
     #else
         #include "ovs-atomic-pthreads.h"