diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 21:53:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 21:53:58 +0100 |
| commit | 0a30ad34735745c0e0f1610ab43c205255527f00 (patch) | |
| tree | 635f3f8e878188044411a8f8939fb4af80d71e4c | |
| parent | 4332b01c30a446e9c177fe44761a612daa0334c7 (diff) | |
| parent | 874c751cc5b99cd68932e21c2c3a0d21134207e0 (diff) | |
Merge commit '874c751cc5b99cd68932e21c2c3a0d21134207e0'
* commit '874c751cc5b99cd68932e21c2c3a0d21134207e0':
threads: Check w32threads dependencies at the configure stage
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavutil/atomic.c | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -1859,6 +1859,7 @@ atomics_gcc_if="sync_val_compare_and_swap" atomics_suncc_if="atomic_cas_ptr machine_rw_barrier" atomics_win32_if="MemoryBarrier" atomics_native_if_any="$ATOMICS_LIST" +w32threads_deps="atomics_native" threads_if_any="$THREADS_LIST" # subsystems diff --git a/libavutil/atomic.c b/libavutil/atomic.c index b7b3872d6c..1fa6308630 100644 --- a/libavutil/atomic.c +++ b/libavutil/atomic.c @@ -97,8 +97,11 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) return *ptr; } -#else +#else /* HAVE_THREADS */ +/* This should never trigger, unless a new threading implementation + * without correct atomics dependencies in configure or a corresponding + * atomics implementation is added. */ #error "Threading is enabled, but there is no implementation of atomic operations available" #endif /* HAVE_PTHREADS */ |