diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-20 13:09:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-20 13:16:56 +0100 |
| commit | 3f307d79d383e0ac505c9f8393d94fb36a092c05 (patch) | |
| tree | b12e93c873578abb3b42f91293d6817adc425126 | |
| parent | 3b6e8634c3be16f6a34d9679d0d641e817f0944d (diff) | |
| parent | e1b9de4fe15cda08cb18a2821a5729cf95e33d2a (diff) | |
| download | ffmpeg-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>
| -rw-r--r-- | libavutil/atomic.c | 3 | ||||
| -rw-r--r-- | libavutil/atomic.h | 7 |
2 files changed, 8 insertions, 2 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" diff --git a/libavutil/atomic.h b/libavutil/atomic.h index fd7d8fc03e..15906d24c9 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 */ |