Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'

[ffmpeg] / libavutil / atomic.h

diff --git a/libavutil/atomic.h b/libavutil/atomic.h
index 1d2a34548e8c78b9fcbac78da08751c9900cd4f7..fd7d8fc03e0b9aea0de4d061ab706cf034573228 100644 (file)
--- a/libavutil/atomic.h
+++ b/libavutil/atomic.h
@@ -23,11 +23,11 @@
 
 #include "config.h"
 
-#if HAVE_SYNC_VAL_COMPARE_AND_SWAP
+#if HAVE_ATOMICS_GCC
 #include "atomic_gcc.h"
-#elif HAVE_MEMORYBARRIER
+#elif HAVE_ATOMICS_WIN32
 #include "atomic_win32.h"
-#elif HAVE_MACHINE_RW_BARRIER
+#elif HAVE_ATOMICS_SUNCC
 #include "atomic_suncc.h"
 #else