diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 15:08:21 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 15:08:21 +0200 |
commit | 4d636947b4e21eabb01d96ebe57ddc455599a173 (patch) | |
tree | cdd1024d6b74db617f4d074c12ea85d5814d8633 /configure | |
parent | e3cc92a623a6ece42816c7a692c8815688a99ab0 (diff) | |
parent | 817dff578f13ce97576c609ab141508b9dc782e9 (diff) | |
download | ffmpeg-4d636947b4e21eabb01d96ebe57ddc455599a173.tar.gz |
Merge commit '817dff578f13ce97576c609ab141508b9dc782e9'
* commit '817dff578f13ce97576c609ab141508b9dc782e9':
configure: Check for the atomic.h functions used in the suncc atomics header
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1391,6 +1391,7 @@ HAVE_LIST=" asm_mod_q asm_mod_y asm_types_h + atomic_cas_ptr atomics_native attribute_may_alias attribute_packed @@ -3837,6 +3838,7 @@ check_func strerror_r check_func sched_getaffinity check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval, newval; __sync_val_compare_and_swap(ptr, oldval, newval)" check_builtin machine_rw_barrier mbarrier.h "__machine_rw_barrier()" +check_builtin atomic_cas_ptr atomic.h "void **ptr; void *oldval, *newval; atomic_cas_ptr(ptr, oldval, newval)" check_builtin MemoryBarrier windows.h "MemoryBarrier()" check_func sysconf check_func sysctl @@ -3918,7 +3920,7 @@ if enabled pthreads; then fi enabled sync_val_compare_and_swap && enable atomics_gcc -enabled machine_rw_barrier && enable atomics_suncc +enabled machine_rw_barrier && enabled atomic_cas_ptr && enable atomics_suncc enabled MemoryBarrier && enable atomics_win32 check_lib math.h sin -lm && LIBM="-lm" |