summaryrefslogtreecommitdiffstats
path: root/audio/out
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-07 11:26:25 +0200
committerwm4 <wm4@nowhere>2016-09-07 11:26:25 +0200
commit591e21a2ebd105c33127d4a792d4d0e1a083fcfc (patch)
tree14765300678fa16bff6ca0f47ec6cfbbb866d871 /audio/out
parentc6b7a4dacee3067ad00abdb3abf71c7e8eb62e78 (diff)
downloadmpv-591e21a2ebd105c33127d4a792d4d0e1a083fcfc.tar.bz2
mpv-591e21a2ebd105c33127d4a792d4d0e1a083fcfc.tar.xz
osdep: rename atomics.h to atomic.h
The standard header is stdatomic.h, so the extra "s" freaks me out every time I look at it.
Diffstat (limited to 'audio/out')
-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
5 files changed, 5 insertions, 5 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"