summaryrefslogtreecommitdiff
path: root/libavutil/atomic.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2013-03-10 23:03:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-12 10:41:09 +0100
commitb91459e565ec29f6dc6cf1bce2b64ee632e50412 (patch)
treee494170b2eeddba6b18ce8d2c02529b3008fbe71 /libavutil/atomic.h
parentc48828f763672e45f0b1a20de41fb7ddd744462b (diff)
atomic: prefer gcc builtins over win32 atomics, if available.
The mingw win32 atomics appear to be faulty, so they should not be used if the gcc ones are available. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavutil/atomic.h')
-rw-r--r--libavutil/atomic.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/atomic.h b/libavutil/atomic.h
index 61512e0fec..1d2a34548e 100644
--- a/libavutil/atomic.h
+++ b/libavutil/atomic.h
@@ -23,10 +23,10 @@
#include "config.h"
-#if HAVE_MEMORYBARRIER
-#include "atomic_win32.h"
-#elif HAVE_SYNC_VAL_COMPARE_AND_SWAP
+#if HAVE_SYNC_VAL_COMPARE_AND_SWAP
#include "atomic_gcc.h"
+#elif HAVE_MEMORYBARRIER
+#include "atomic_win32.h"
#elif HAVE_MACHINE_RW_BARRIER
#include "atomic_suncc.h"
#else