summaryrefslogtreecommitdiff
path: root/libavutil/atomic.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-20 13:09:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-20 13:16:56 +0100
commit3f307d79d383e0ac505c9f8393d94fb36a092c05 (patch)
treeb12e93c873578abb3b42f91293d6817adc425126 /libavutil/atomic.c
parent3b6e8634c3be16f6a34d9679d0d641e817f0944d (diff)
parente1b9de4fe15cda08cb18a2821a5729cf95e33d2a (diff)
downloadffmpeg-3f307d79d383e0ac505c9f8393d94fb36a092c05.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: atomics: cosmetics: Restructure ifdefs for greater clarity Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/atomic.c')
-rw-r--r--libavutil/atomic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/atomic.c b/libavutil/atomic.c
index 04182f2330..b7b3872d6c 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 "avassert.h"