From f7813a5324be39d13ab536c245d15dfc602a7849 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Sun, 29 Dec 2013 12:19:38 +0000
Subject: basic type mechanism working

---
 ffmpeg/libavutil/atomic.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'ffmpeg/libavutil/atomic.h')

diff --git a/ffmpeg/libavutil/atomic.h b/ffmpeg/libavutil/atomic.h
index 1d2a345..15906d2 100644
--- a/ffmpeg/libavutil/atomic.h
+++ b/ffmpeg/libavutil/atomic.h
@@ -23,12 +23,16 @@
 
 #include "config.h"
 
-#if HAVE_SYNC_VAL_COMPARE_AND_SWAP
+#if HAVE_ATOMICS_NATIVE
+
+#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"
+#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 */
-- 
cgit v1.2.3