diff options
| author | NRK <nrk@disroot.org> | 2023-10-19 18:18:52 +0600 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2023-10-20 21:31:09 +0200 |
| commit | 2070331f649a1e19021d62d4e3a176dcd40732f4 (patch) | |
| tree | a41f1f4931ba1e3d4ae242be285eee18de650f38 /options | |
| parent | 2fa695c3f9d4164344228ef4083e87369de3bb33 (diff) | |
| download | mpv-2070331f649a1e19021d62d4e3a176dcd40732f4.tar.bz2 mpv-2070331f649a1e19021d62d4e3a176dcd40732f4.tar.xz | |
osdep: remove atomic.h
replace it with <stdatomic.h> and replace the mp_atomic_* typedefs with
explicit _Atomic qualified types.
also add missing config.h includes on some files.
Diffstat (limited to 'options')
| -rw-r--r-- | options/m_config_core.c | 4 | ||||
| -rw-r--r-- | options/m_config_frontend.c | 2 | ||||
| -rw-r--r-- | options/m_config_frontend.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/options/m_config_core.c b/options/m_config_core.c index 74a4aa00f7..3357d31ee6 100644 --- a/options/m_config_core.c +++ b/options/m_config_core.c @@ -31,13 +31,13 @@ #include "common/msg.h" #include "common/msg_control.h" #include "misc/dispatch.h" -#include "osdep/atomic.h" +#include <stdatomic.h> // For use with m_config_cache. struct m_config_shadow { pthread_mutex_t lock; // Incremented on every option change. - mp_atomic_uint64 ts; + _Atomic uint64_t ts; // -- immutable after init // List of m_sub_options instances. // Index 0 is the top-level and is always present. diff --git a/options/m_config_frontend.c b/options/m_config_frontend.c index 8ad12e5d80..032f54803b 100644 --- a/options/m_config_frontend.c +++ b/options/m_config_frontend.c @@ -36,7 +36,7 @@ #include "common/msg_control.h" #include "misc/dispatch.h" #include "misc/node.h" -#include "osdep/atomic.h" +#include <stdatomic.h> extern const char mp_help_text[]; diff --git a/options/m_config_frontend.h b/options/m_config_frontend.h index 72a5b81d94..3f0b25a5b2 100644 --- a/options/m_config_frontend.h +++ b/options/m_config_frontend.h @@ -29,7 +29,7 @@ #include "misc/bstr.h" #include "misc/dispatch.h" #include "options/m_option.h" -#include "osdep/atomic.h" +#include <stdatomic.h> // m_config provides an API to manipulate the config variables in MPlayer. // It makes use of the Options API to provide a context stack that |