X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fatomic.h;h=57a0c19fcbaf04613fd477ecd4d96e50aea21086;hb=3f1f6053013d0015e9f115a91a11744807649a07;hp=577e4714623ebffaff13a37183c1f02932adebd5;hpb=e460aa3282962aa3e89f19e207ec13b501187949;p=ffmpeg

diff --git a/libavutil/atomic.h b/libavutil/atomic.h
index 577e4714623..57a0c19fcba 100644
--- a/libavutil/atomic.h
+++ b/libavutil/atomic.h
@@ -23,12 +23,16 @@
 
 #include "config.h"
 
-#if HAVE_MEMORYBARRIER
-#include "atomic_win32.h"
-#elif HAVE_SYNC_VAL_COMPARE_AND_SWAP
+#if HAVE_ATOMICS_NATIVE
+
+#if HAVE_ATOMICS_GCC
 #include "atomic_gcc.h"
-#elif HAVE_MACHINE_RW_BARRIER
+#elif HAVE_ATOMICS_WIN32
+#include "atomic_win32.h"
+#elif HAVE_ATOMICS_SUNCC
 #include "atomic_suncc.h"
+#endif
+
 #else
 
 /**
@@ -70,5 +74,6 @@ int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc);
  */
 void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval);
 
-#endif /* HAVE_MEMORYBARRIER */
+#endif /* HAVE_ATOMICS_NATIVE */
+
 #endif /* AVUTIL_ATOMIC_H */