summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/out/ao_coreaudio_exclusive.c2
-rw-r--r--audio/out/ao_wasapi.h2
-rw-r--r--audio/out/internal.h2
-rw-r--r--audio/out/pull.c2
-rw-r--r--audio/out/push.c2
-rw-r--r--common/msg.c2
-rw-r--r--input/pipe-win32.c2
-rw-r--r--misc/ring.c2
-rw-r--r--options/m_config.c2
-rw-r--r--osdep/atomic.h (renamed from osdep/atomics.h)4
-rw-r--r--osdep/subprocess-win.c2
-rw-r--r--stream/stream.c2
-rw-r--r--video/out/cocoa_common.m2
-rw-r--r--video/out/w32_common.c2
-rw-r--r--video/out/x11_common.c1
-rw-r--r--video/out/x11_common.h2
16 files changed, 16 insertions, 17 deletions
diff --git a/audio/out/ao_coreaudio_exclusive.c b/audio/out/ao_coreaudio_exclusive.c
index 49f921cd4c..cc20fd9a51 100644
--- a/audio/out/ao_coreaudio_exclusive.c
+++ b/audio/out/ao_coreaudio_exclusive.c
@@ -41,7 +41,7 @@
#include "internal.h"
#include "audio/format.h"
#include "osdep/timer.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "options/m_option.h"
#include "common/msg.h"
#include "audio/out/ao_coreaudio_chmap.h"
diff --git a/audio/out/ao_wasapi.h b/audio/out/ao_wasapi.h
index 3ae50159b3..6dd130b50f 100644
--- a/audio/out/ao_wasapi.h
+++ b/audio/out/ao_wasapi.h
@@ -29,7 +29,7 @@
#include <endpointvolume.h>
#include "common/msg.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "osdep/windows_utils.h"
#include "internal.h"
#include "ao.h"
diff --git a/audio/out/internal.h b/audio/out/internal.h
index fdbb423f52..319881b194 100644
--- a/audio/out/internal.h
+++ b/audio/out/internal.h
@@ -21,7 +21,7 @@
#include <stdbool.h>
#include <pthread.h>
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "audio/out/ao.h"
/* global data used by ao.c and ao drivers */
diff --git a/audio/out/pull.c b/audio/out/pull.c
index 2175a58db0..5dd6525fc8 100644
--- a/audio/out/pull.c
+++ b/audio/out/pull.c
@@ -30,7 +30,7 @@
#include "osdep/timer.h"
#include "osdep/threads.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "misc/ring.h"
/*
diff --git a/audio/out/push.c b/audio/out/push.c
index bf5dde46b5..406b0da790 100644
--- a/audio/out/push.c
+++ b/audio/out/push.c
@@ -35,7 +35,7 @@
#include "osdep/threads.h"
#include "osdep/timer.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "audio/audio.h"
#include "audio/audio_buffer.h"
diff --git a/common/msg.c b/common/msg.c
index 534ba41cb5..b109817c5b 100644
--- a/common/msg.c
+++ b/common/msg.c
@@ -27,7 +27,7 @@
#include "mpv_talloc.h"
#include "misc/bstr.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "common/common.h"
#include "common/global.h"
#include "misc/ring.h"
diff --git a/input/pipe-win32.c b/input/pipe-win32.c
index 3d47fb66c1..a0a0bfef24 100644
--- a/input/pipe-win32.c
+++ b/input/pipe-win32.c
@@ -19,7 +19,7 @@
#include <io.h>
#include "common/msg.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "osdep/io.h"
#include "input.h"
diff --git a/misc/ring.c b/misc/ring.c
index 9ba4306511..d72083475d 100644
--- a/misc/ring.c
+++ b/misc/ring.c
@@ -21,7 +21,7 @@
#include <libavutil/common.h>
#include <assert.h>
#include "mpv_talloc.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "ring.h"
struct mp_ring {
diff --git a/options/m_config.c b/options/m_config.c
index cb9835012f..695c9569e9 100644
--- a/options/m_config.c
+++ b/options/m_config.c
@@ -39,7 +39,7 @@
#include "common/msg.h"
#include "common/msg_control.h"
#include "misc/node.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
static const union m_option_value default_value;
diff --git a/osdep/atomics.h b/osdep/atomic.h
index 1d5134f646..9028a504eb 100644
--- a/osdep/atomics.h
+++ b/osdep/atomic.h
@@ -16,8 +16,8 @@
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MP_ATOMICS_H
-#define MP_ATOMICS_H
+#ifndef MP_ATOMIC_H
+#define MP_ATOMIC_H
#include <inttypes.h>
#include "config.h"
diff --git a/osdep/subprocess-win.c b/osdep/subprocess-win.c
index 614cae663f..3ac0c397aa 100644
--- a/osdep/subprocess-win.c
+++ b/osdep/subprocess-win.c
@@ -21,7 +21,7 @@
#include "osdep/subprocess.h"
#include "osdep/io.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "mpv_talloc.h"
#include "common/common.h"
diff --git a/stream/stream.c b/stream/stream.c
index 6e45f0a549..69772f335a 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -26,7 +26,7 @@
#include <assert.h>
#include <libavutil/common.h>
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "osdep/io.h"
#include "mpv_talloc.h"
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 7cb30cc49d..18e6860e7d 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -30,7 +30,7 @@
#import "video/out/cocoa/mpvadapter.h"
#include "osdep/threads.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "osdep/macosx_compat.h"
#include "osdep/macosx_events_objc.h"
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index 46e9052e43..0dff2643b1 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -40,7 +40,7 @@
#include "osdep/io.h"
#include "osdep/threads.h"
#include "osdep/w32_keyboard.h"
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "misc/dispatch.h"
#include "misc/rendezvous.h"
#include "mpv_talloc.h"
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index aa2185315e..32f5c6c723 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -40,7 +40,6 @@
#include "vo.h"
#include "win_state.h"
-#include "osdep/atomics.h"
#include "osdep/io.h"
#include "osdep/timer.h"
#include "osdep/subprocess.h"
diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index 213d517205..de2a805efd 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -24,7 +24,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#include "osdep/atomics.h"
+#include "osdep/atomic.h"
#include "osdep/semaphore.h"
#include "common/common.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 22:06:08 +0000