From 6f8cf73f54c4b1f80d69ecd30d269f16df70ef6e Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 30 Nov 2017 01:14:33 +0100 Subject: ao: simplify hack for float atomics stdatomic.h defines no atomic_float typedef. We can't just use _Atomic unconditionally, because we support compilers without C11 atomics. So just create a custom atomic_float typedef in the wrapper, which uses _Atomic in the C11 code path. --- osdep/atomic.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'osdep') diff --git a/osdep/atomic.h b/osdep/atomic.h index 1d3e158afa..a5608fa78a 100644 --- a/osdep/atomic.h +++ b/osdep/atomic.h @@ -24,6 +24,7 @@ #if HAVE_STDATOMIC #include +typedef _Atomic float mp_atomic_float; #else // Emulate the parts of C11 stdatomic.h needed by mpv. @@ -36,6 +37,8 @@ typedef struct { long long v; } atomic_llong; typedef struct { uint_least32_t v; } atomic_uint_least32_t; typedef struct { unsigned long long v; } atomic_ullong; +typedef struct { float v; } mp_atomic_float; + #define ATOMIC_VAR_INIT(x) \ {.v = (x)} -- cgit v1.2.3