Commit 0a30ad34 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '874c751c'

* commit '874c751c':
  threads: Check w32threads dependencies at the configure stage
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4332b01c 874c751c
...@@ -1859,6 +1859,7 @@ atomics_gcc_if="sync_val_compare_and_swap" ...@@ -1859,6 +1859,7 @@ atomics_gcc_if="sync_val_compare_and_swap"
atomics_suncc_if="atomic_cas_ptr machine_rw_barrier" atomics_suncc_if="atomic_cas_ptr machine_rw_barrier"
atomics_win32_if="MemoryBarrier" atomics_win32_if="MemoryBarrier"
atomics_native_if_any="$ATOMICS_LIST" atomics_native_if_any="$ATOMICS_LIST"
w32threads_deps="atomics_native"
threads_if_any="$THREADS_LIST" threads_if_any="$THREADS_LIST"
# subsystems # subsystems
......
...@@ -97,8 +97,11 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) ...@@ -97,8 +97,11 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval)
return *ptr; 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" #error "Threading is enabled, but there is no implementation of atomic operations available"
#endif /* HAVE_PTHREADS */ #endif /* HAVE_PTHREADS */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment