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 /osdep | |
| 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 'osdep')
| -rw-r--r-- | osdep/atomic.h | 31 | ||||
| -rw-r--r-- | osdep/windows_utils.c | 2 |
2 files changed, 1 insertions, 32 deletions
diff --git a/osdep/atomic.h b/osdep/atomic.h deleted file mode 100644 index ea00cea9b7..0000000000 --- a/osdep/atomic.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of mpv. - * Copyright (c) 2013 Stefano Pigozzi <stefano.pigozzi@gmail.com> - * - * mpv is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with mpv. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef MP_ATOMIC_H -#define MP_ATOMIC_H - -#include <inttypes.h> -#include "config.h" - -#include <stdatomic.h> -typedef _Atomic float mp_atomic_float; -typedef _Atomic double mp_atomic_double; -typedef _Atomic int64_t mp_atomic_int64; -typedef _Atomic uint64_t mp_atomic_uint64; - -#endif diff --git a/osdep/windows_utils.c b/osdep/windows_utils.c index a647e9f00d..6a5abff291 100644 --- a/osdep/windows_utils.c +++ b/osdep/windows_utils.c @@ -25,7 +25,7 @@ #include <dxgi1_2.h> #include "common/common.h" -#include "osdep/atomic.h" +#include <stdatomic.h> #include "windows_utils.h" char *mp_GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid) |