summaryrefslogtreecommitdiff
path: root/libavutil/atomic.h
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-12-18 22:28:11 +0100
committerDiego Biurrun <diego@biurrun.de>2013-12-20 11:23:13 +0100
commite1b9de4fe15cda08cb18a2821a5729cf95e33d2a (patch)
treee1e306a18edb3ed1625cd262c61d791358713ec9 /libavutil/atomic.h
parent8558595a59913a4667f57d5a4658b1340f1a4354 (diff)
atomics: cosmetics: Restructure ifdefs for greater clarity
Also fix the #endif comment in a few places and #include config.h to avoid assuming it is #included implicitly.
Diffstat (limited to 'libavutil/atomic.h')
-rw-r--r--libavutil/atomic.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavutil/atomic.h b/libavutil/atomic.h
index a5c5fe86bf..57a0c19fcb 100644
--- a/libavutil/atomic.h
+++ b/libavutil/atomic.h
@@ -23,12 +23,16 @@
#include "config.h"
+#if HAVE_ATOMICS_NATIVE
+
#if HAVE_ATOMICS_GCC
#include "atomic_gcc.h"
#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 */