summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2013-03-10 23:03:42 +0100
committerMartin Storsjö <martin@martin.st>2013-03-11 16:57:25 +0200
commitd6d369bf1370999896500ae7eb5b9447ab635a3d (patch)
tree5bbf665ddff56db085c7949e75c159a6517fb341 /libavutil
parentfc8406d01ed5266d9ffefa4f0b6319f966786bf9 (diff)
downloadffmpeg-d6d369bf1370999896500ae7eb5b9447ab635a3d.tar.gz
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')
-rw-r--r--libavutil/atomic.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/atomic.h b/libavutil/atomic.h
index 577e471462..773c5df1bd 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