---

Now without a silly leftover line in configure.

 configure          | 2 +-
 libavutil/atomic.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 292da47..cb566c0 100755
--- a/configure
+++ b/configure
@@ -1606,7 +1606,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"
-threads_if_any="$THREADS_LIST"
+threads_if_any="atomics_native pthreads"
 
 # subsystems
 dct_select="rdft"
diff --git a/libavutil/atomic.c b/libavutil/atomic.c
index e4fa957..38e998e 100644
--- a/libavutil/atomic.c
+++ b/libavutil/atomic.c
@@ -70,7 +70,7 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void 
*oldval, void *newval)
     return ret;
 }
 
-#elif !HAVE_THREADS
+#else
 
 int avpriv_atomic_int_get(volatile int *ptr)
 {
@@ -97,10 +97,6 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void 
*oldval, void *newval)
     return *ptr;
 }
 
-#else
-
-#error "Threading is enabled, but there is no implementation of atomic 
operations available"
-
 #endif /* HAVE_PTHREADS */
 
 #endif /* !HAVE_ATOMICS_NATIVE */
-- 
1.8.3.2

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to