From b91459e565ec29f6dc6cf1bce2b64ee632e50412 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Sun, 10 Mar 2013 23:03:42 +0100 Subject: [PATCH] atomic: prefer gcc builtins over win32 atomics, if available. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö --- libavutil/atomic.h | 6 +++--- 1 file 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