[vlc-commits] Remove/substitute useless vlc_atomic.h include

Rémi Denis-Courmont git at videolan.org
Thu Feb 27 21:38:27 CET 2020


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Feb 27 22:37:24 2020 +0200| [3906d0e0d79d5d715ac10c59bd8402d810662a78] | committer: Rémi Denis-Courmont

Remove/substitute useless vlc_atomic.h include

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3906d0e0d79d5d715ac10c59bd8402d810662a78
---

 modules/audio_output/mmdevice.c  | 2 +-
 modules/audio_output/wasapi.c    | 2 +-
 modules/codec/omxil/mediacodec.c | 2 +-
 modules/hw/vdpau/adjust.c        | 1 -
 src/darwin/thread.c              | 2 +-
 src/misc/background_worker.c     | 1 -
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/audio_output/mmdevice.c b/modules/audio_output/mmdevice.c
index bf1d2958bd..55d0fbb57d 100644
--- a/modules/audio_output/mmdevice.c
+++ b/modules/audio_output/mmdevice.c
@@ -26,6 +26,7 @@
 #define COBJMACROS
 #define CONST_VTABLE
 
+#include <stdatomic.h>
 #include <stdlib.h>
 #include <math.h>
 #include <assert.h>
@@ -37,7 +38,6 @@ DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd,
    0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14);
 
 #include <vlc_common.h>
-#include <vlc_atomic.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_charset.h>
diff --git a/modules/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index 2e8b4ff52a..5180e93f8e 100644
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -27,13 +27,13 @@
 #define CONST_VTABLE
 #define NONEWWAVE
 
+#include <stdatomic.h>
 #include <stdlib.h>
 #include <assert.h>
 
 #include <vlc_common.h>
 #include <vlc_codecs.h>
 #include <vlc_aout.h>
-#include <vlc_atomic.h>
 #include <vlc_plugin.h>
 
 #include <audioclient.h>
diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index 0a269db7d0..6a55f70d69 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -27,6 +27,7 @@
 # include "config.h"
 #endif
 
+#include <stdatomic.h>
 #include <stdint.h>
 #include <assert.h>
 
@@ -37,7 +38,6 @@
 #include <vlc_block_helper.h>
 #include <vlc_timestamp_helper.h>
 #include <vlc_threads.h>
-#include <vlc_atomic.h>
 #include <vlc_bits.h>
 
 #include "mediacodec.h"
diff --git a/modules/hw/vdpau/adjust.c b/modules/hw/vdpau/adjust.c
index 9535963263..27c8b4bfa7 100644
--- a/modules/hw/vdpau/adjust.c
+++ b/modules/hw/vdpau/adjust.c
@@ -29,7 +29,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
-#include <vlc_atomic.h>
 #include <vlc_picture.h>
 #include "vlc_vdpau.h"
 
diff --git a/src/darwin/thread.c b/src/darwin/thread.c
index 3c796fc06e..7e7de3d815 100644
--- a/src/darwin/thread.c
+++ b/src/darwin/thread.c
@@ -30,7 +30,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_atomic.h>
+#include <stdatomic.h>
 
 #include "libvlc.h"
 #include <signal.h>
diff --git a/src/misc/background_worker.c b/src/misc/background_worker.c
index a2436ddfbd..05e28d813c 100644
--- a/src/misc/background_worker.c
+++ b/src/misc/background_worker.c
@@ -22,7 +22,6 @@
 
 #include <assert.h>
 #include <vlc_common.h>
-#include <vlc_atomic.h>
 #include <vlc_list.h>
 #include <vlc_threads.h>
 



More information about the vlc-commits mailing list