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/atomic.c | |
| parent | 6fcb4ae1d81dd104598001f55c80864c08d848af (diff) | |
| parent | f9f6402e9c9ce3642df981b48507df3a2d956f65 (diff) | |
Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'
* commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65':
configure: prettify atomics handling.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/atomic.c')
| -rw-r--r-- | libavutil/atomic.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |