diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 14:46:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 14:46:48 +0200 |
| commit | 6ce1d873552ac99d52e6f174a9f76993402565d3 (patch) | |
| tree | 7ad441a8ae8f75b1cd3807ca0c3cb43a2c237002 /libavutil | |
| parent | 6fcb4ae1d81dd104598001f55c80864c08d848af (diff) | |
| parent | f9f6402e9c9ce3642df981b48507df3a2d956f65 (diff) | |
| download | ffmpeg-6ce1d873552ac99d52e6f174a9f76993402565d3.tar.gz | |
Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'
* commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65':
configure: prettify atomics handling.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/Makefile | 6 | ||||
| -rw-r--r-- | libavutil/atomic.c | 2 | ||||
| -rw-r--r-- | libavutil/atomic.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index b520473d9b..92dea3b1ab 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -114,9 +114,9 @@ OBJS += $(COMPAT_OBJS:%=../compat/%) SKIPHEADERS = old_pix_fmts.h -SKIPHEADERS-$(HAVE_MACHINE_RW_BARRIER) += atomic_suncc.h -SKIPHEADERS-$(HAVE_MEMORYBARRIER) += atomic_win32.h -SKIPHEADERS-$(HAVE_SYNC_VAL_COMPARE_AND_SWAP) += atomic_gcc.h +SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h +SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h +SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h TESTPROGS = adler32 \ aes \ diff --git a/libavutil/atomic.c b/libavutil/atomic.c index 0780d8a679..04182f2330 100644 --- a/libavutil/atomic.c +++ b/libavutil/atomic.c @@ -20,7 +20,7 @@ #include "atomic.h" -#if !HAVE_MEMORYBARRIER && !HAVE_SYNC_VAL_COMPARE_AND_SWAP && !HAVE_MACHINE_RW_BARRIER +#if !HAVE_ATOMICS_NATIVE #if HAVE_PTHREADS diff --git a/libavutil/atomic.h b/libavutil/atomic.h index 1d2a34548e..fd7d8fc03e 100644 --- a/libavutil/atomic.h +++ b/libavutil/atomic.h @@ -23,11 +23,11 @@ #include "config.h" -#if HAVE_SYNC_VAL_COMPARE_AND_SWAP +#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" #else |