From e1b9de4fe15cda08cb18a2821a5729cf95e33d2a Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 18 Dec 2013 22:28:11 +0100
Subject: 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.
---
 libavutil/atomic.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libavutil/atomic.c')

diff --git a/libavutil/atomic.c b/libavutil/atomic.c
index add489a26e..e4fa957ba4 100644
--- a/libavutil/atomic.c
+++ b/libavutil/atomic.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
 #include "atomic.h"
 
 #if !HAVE_ATOMICS_NATIVE
@@ -102,7 +103,7 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval)
 
 #endif /* HAVE_PTHREADS */
 
-#endif /* !HAVE_MEMORYBARRIER && !HAVE_SYNC_VAL_COMPARE_AND_SWAP && !HAVE_MACHINE_RW_BARRIER */
+#endif /* !HAVE_ATOMICS_NATIVE */
 
 #ifdef TEST
 #include <assert.h>
-- 
cgit v1.2.3