[vlc-devel] [PATCH] vlc_common.h: Don't include vlc_threads.h

Hugo Beauzée-Luyssen hugo at beauzee.fr
Tue Aug 21 12:07:06 CEST 2018


This allows vlc_interrupt.h to be included before vlc_threads and will
simplify implementing threads C++ helpers in vlc_threads.h instead of
vlc_cxx_helpers.hpp (with a weird/ugly check for VLC_THREADS_H_)
It also makes sense not to force the inclusion of vlc_threads.h if one
does not need threading functions.

Tested when building for GNU/Linux & Windows, but not on macOS
---
 include/vlc_avcodec.h                                       | 2 ++
 include/vlc_block.h                                         | 2 ++
 include/vlc_common.h                                        | 1 -
 include/vlc_events.h                                        | 1 +
 include/vlc_extensions.h                                    | 1 +
 include/vlc_gcrypt.h                                        | 1 +
 include/vlc_interface.h                                     | 2 ++
 include/vlc_sout.h                                          | 1 +
 include/vlc_xlib.h                                          | 1 +
 lib/libvlc_internal.h                                       | 1 +
 modules/access/dshow/crossbar.cpp                           | 1 +
 modules/access/dshow/dshow.cpp                              | 1 +
 modules/access/dshow/filter.cpp                             | 1 +
 modules/access/dtv/en50221.c                                | 6 ++++--
 modules/access/http/h2output.c                              | 1 +
 modules/access/http/tunnel.c                                | 1 +
 modules/access/v4l2/lib.c                                   | 1 +
 modules/demux/adaptive/http/Chunk.h                         | 2 ++
 modules/demux/adaptive/http/HTTPConnectionManager.h         | 1 +
 modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp | 1 +
 modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp  | 1 +
 modules/demux/adaptive/logic/RateBasedAdaptationLogic.h     | 1 +
 modules/demux/adaptive/plumbing/CommandsQueue.hpp           | 1 +
 modules/demux/adaptive/plumbing/FakeESOut.hpp               | 1 +
 modules/hw/d3d11/d3d11_instance.c                           | 1 +
 modules/hw/d3d11/d3d11_surface.c                            | 1 +
 modules/hw/d3d9/d3d9_instance.c                             | 1 +
 modules/hw/vaapi/filters.c                                  | 1 +
 modules/keystore/file.c                                     | 3 +++
 modules/keystore/memory.c                                   | 1 +
 modules/misc/inhibit/xdg.c                                  | 1 +
 modules/services_discovery/upnp-wrapper.cpp                 | 1 +
 modules/services_discovery/upnp.cpp                         | 1 +
 modules/spu/audiobargraph_v.c                               | 1 +
 modules/spu/dynamicoverlay/dynamicoverlay.h                 | 1 +
 modules/spu/logo.c                                          | 1 +
 modules/spu/mosaic.c                                        | 1 +
 modules/spu/subsdelay.c                                     | 1 +
 modules/text_renderer/freetype/fonts/fontconfig.c           | 1 +
 modules/video_filter/alphamask.c                            | 1 +
 modules/video_filter/ball.c                                 | 1 +
 modules/video_filter/bluescreen.c                           | 1 +
 modules/video_filter/extract.c                              | 1 +
 modules/video_filter/gradfun.c                              | 1 +
 modules/video_filter/grain.c                                | 1 +
 modules/video_filter/hqdn3d.c                               | 1 +
 modules/video_filter/magnify.c                              | 1 +
 modules/video_filter/oldmovie.c                             | 1 +
 modules/video_filter/postproc.c                             | 1 +
 modules/video_filter/puzzle.h                               | 1 +
 modules/video_filter/ripple.c                               | 1 +
 modules/video_filter/vhs.c                                  | 1 +
 modules/video_filter/wave.c                                 | 1 +
 modules/video_output/drawable.c                             | 1 +
 modules/video_output/vdummy.c                               | 1 +
 modules/video_output/win32/direct3d9.c                      | 1 +
 modules/video_output/win32/directdraw.c                     | 1 +
 modules/video_output/win32/events.c                         | 1 +
 modules/video_output/win32/inhibit.c                        | 1 +
 modules/video_output/xcb/window.c                           | 1 +
 src/config/configuration.h                                  | 2 ++
 src/config/core.c                                           | 1 +
 src/config/help.c                                           | 1 +
 src/input/item.c                                            | 1 +
 src/interface/interface.c                                   | 1 +
 src/linux/cpu.c                                             | 1 +
 src/misc/httpcookies.c                                      | 1 +
 src/misc/picture_fifo.c                                     | 1 +
 src/misc/picture_pool.c                                     | 1 +
 src/misc/rand.c                                             | 1 +
 src/misc/threads.c                                          | 1 +
 src/modules/entry.c                                         | 1 +
 src/playlist/engine.c                                       | 1 +
 src/posix/timer.c                                           | 1 +
 src/video_output/snapshot.h                                 | 1 +
 src/video_output/video_text.c                               | 1 +
 src/video_output/video_widgets.c                            | 1 +
 src/win32/timer.c                                           | 1 +
 78 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/include/vlc_avcodec.h b/include/vlc_avcodec.h
index 664633a2d4..fc4b3e5481 100644
--- a/include/vlc_avcodec.h
+++ b/include/vlc_avcodec.h
@@ -21,6 +21,8 @@
 #ifndef VLC_AVCODEC_H
 # define VLC_AVCODEC_H 1
 
+#include <vlc_threads.h>
+
 static inline void vlc_avcodec_lock (void)
 {
     vlc_global_lock (VLC_AVCODEC_MUTEX);
diff --git a/include/vlc_block.h b/include/vlc_block.h
index e54cc52e35..bc02e8b673 100644
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -24,6 +24,8 @@
 #ifndef VLC_BLOCK_H
 #define VLC_BLOCK_H 1
 
+#include <vlc_threads.h>
+
 /**
  * \defgroup block Data blocks
  * \ingroup input
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 4f2d0baf52..bd3820beab 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -519,7 +519,6 @@ typedef int ( * vlc_list_callback_t ) ( vlc_object_t *,      /* variable's objec
 #endif
 
 #include "vlc_tick.h"
-#include "vlc_threads.h"
 
 /**
  * \defgroup intops Integer operations
diff --git a/include/vlc_events.h b/include/vlc_events.h
index 71d701fe03..9ec5937dfb 100644
--- a/include/vlc_events.h
+++ b/include/vlc_events.h
@@ -25,6 +25,7 @@
 #ifndef VLC_EVENTS_H
 # define VLC_EVENTS_H
 
+#include <vlc_threads.h>
 #include <vlc_arrays.h>
 #include <vlc_meta.h>
 
diff --git a/include/vlc_extensions.h b/include/vlc_extensions.h
index 0312835549..06bc79ffa0 100644
--- a/include/vlc_extensions.h
+++ b/include/vlc_extensions.h
@@ -25,6 +25,7 @@
 #define VLC_EXTENSIONS_H
 
 #include "vlc_common.h"
+#include "vlc_threads.h"
 #include "vlc_arrays.h"
 
 /* Structures */
diff --git a/include/vlc_gcrypt.h b/include/vlc_gcrypt.h
index a04e1b1d86..e342ba202f 100644
--- a/include/vlc_gcrypt.h
+++ b/include/vlc_gcrypt.h
@@ -24,6 +24,7 @@
  */
 
 #include <errno.h>
+#include <vlc_threads.h>
 
 static inline void vlc_gcrypt_init (void)
 {
diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index f56eae598b..c001db733b 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -26,6 +26,8 @@
 #ifndef VLC_INTF_H_
 #define VLC_INTF_H_
 
+#include <vlc_threads.h>
+
 # ifdef __cplusplus
 extern "C" {
 # endif
diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 214b29ac17..2dea8515f0 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -34,6 +34,7 @@ extern "C" {
 
 #include <sys/types.h>
 #include <vlc_es.h>
+#include <vlc_threads.h>
 
 /**
  * \defgroup sout Stream output
diff --git a/include/vlc_xlib.h b/include/vlc_xlib.h
index b6818c15d4..855ec907e8 100644
--- a/include/vlc_xlib.h
+++ b/include/vlc_xlib.h
@@ -25,6 +25,7 @@
 # include <stdlib.h>
 # include <X11/Xlib.h>
 # include <X11/Xlibint.h>
+#include <vlc_threads.h>
 
 static inline bool vlc_xlib_init (vlc_object_t *obj)
 {
diff --git a/lib/libvlc_internal.h b/lib/libvlc_internal.h
index 44df3cfd6f..30d0541cfc 100644
--- a/lib/libvlc_internal.h
+++ b/lib/libvlc_internal.h
@@ -35,6 +35,7 @@
 #include <vlc/libvlc_events.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 
 /* Note well: this header is included from LibVLC core.
  * Therefore, static inline functions MUST NOT call LibVLC functions here
diff --git a/modules/access/dshow/crossbar.cpp b/modules/access/dshow/crossbar.cpp
index 7e2a55ad19..140709d51d 100644
--- a/modules/access/dshow/crossbar.cpp
+++ b/modules/access/dshow/crossbar.cpp
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 
 #ifndef _MSC_VER
     /* Work-around a bug in w32api-2.5 */
diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 2a4183c5c3..5f60c2618d 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -37,6 +37,7 @@
 #include <stdexcept>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_demux.h>
diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp
index fa696fe344..19168f016b 100644
--- a/modules/access/dshow/filter.cpp
+++ b/modules/access/dshow/filter.cpp
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_fourcc.h>
 
 #ifndef _MSC_VER
diff --git a/modules/access/dtv/en50221.c b/modules/access/dtv/en50221.c
index 6126b5d7f2..7d4e537016 100644
--- a/modules/access/dtv/en50221.c
+++ b/modules/access/dtv/en50221.c
@@ -27,6 +27,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_charset.h>
 #include <vlc_fs.h>
 
@@ -38,6 +39,7 @@
 #include <sys/uio.h>
 #include <poll.h>
 #include <netinet/in.h>
+#include <unistd.h>
 
 /* DVB Card Drivers */
 #include <linux/dvb/ca.h>
@@ -1265,11 +1267,11 @@ static void CAPMTAdd( cam_t * p_cam, int i_session_id,
         CAPMTFirst( p_cam, i_session_id, p_info );
         return;
     }
- 
+
 #ifdef CAPMT_WAIT
     vlc_tick_sleep( VLC_TICK_FROM_MS(CAPMT_WAIT) );
 #endif
- 
+
     msg_Dbg( p_cam->obj, "adding CAPMT for SID %d on session %d",
              p_info->i_program_number, i_session_id );
 
diff --git a/modules/access/http/h2output.c b/modules/access/http/h2output.c
index 4ed8e33129..33c79bee45 100644
--- a/modules/access/http/h2output.c
+++ b/modules/access/http/h2output.c
@@ -32,6 +32,7 @@
 # include <sys/uio.h>
 #endif
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_tls.h>
 #include "h2frame.h"
 #include "h2output.h"
diff --git a/modules/access/http/tunnel.c b/modules/access/http/tunnel.c
index 6ad53a0e25..27ff27581a 100644
--- a/modules/access/http/tunnel.c
+++ b/modules/access/http/tunnel.c
@@ -29,6 +29,7 @@
 #include <string.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_tls.h>
 #include <vlc_url.h>
 #include "message.h"
diff --git a/modules/access/v4l2/lib.c b/modules/access/v4l2/lib.c
index dc46b1acfe..59df9b389b 100644
--- a/modules/access/v4l2/lib.c
+++ b/modules/access/v4l2/lib.c
@@ -28,6 +28,7 @@
 #include <sys/mman.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 
 #include "v4l2.h"
 
diff --git a/modules/demux/adaptive/http/Chunk.h b/modules/demux/adaptive/http/Chunk.h
index 0b5efd5fe9..eef7c52a74 100644
--- a/modules/demux/adaptive/http/Chunk.h
+++ b/modules/demux/adaptive/http/Chunk.h
@@ -32,6 +32,8 @@
 #include <string>
 #include <stdint.h>
 
+#include <vlc_threads.h>
+
 typedef struct block_t block_t;
 
 namespace adaptive
diff --git a/modules/demux/adaptive/http/HTTPConnectionManager.h b/modules/demux/adaptive/http/HTTPConnectionManager.h
index ea64563ce3..6fc7b8d6a5 100644
--- a/modules/demux/adaptive/http/HTTPConnectionManager.h
+++ b/modules/demux/adaptive/http/HTTPConnectionManager.h
@@ -28,6 +28,7 @@
 #include "../logic/IDownloadRateObserver.h"
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 
 #include <vector>
 #include <string>
diff --git a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
index 1a3f4ef2be..c1caeb9ac4 100644
--- a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
@@ -24,6 +24,7 @@
 #include "Representationselectors.hpp"
 #include "../tools/MovingAverage.hpp"
 #include <map>
+#include <vlc_threads.h>
 
 namespace adaptive
 {
diff --git a/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp b/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp
index b7acfdc257..a1da72938a 100644
--- a/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp
@@ -23,6 +23,7 @@
 #include "AbstractAdaptationLogic.h"
 #include "../tools/MovingAverage.hpp"
 #include <map>
+#include <vlc_threads.h>
 
 namespace adaptive
 {
diff --git a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
index e2823d37ee..8165988cbb 100644
--- a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
@@ -27,6 +27,7 @@
 
 #include "AbstractAdaptationLogic.h"
 #include "../tools/MovingAverage.hpp"
+#include <vlc_threads.h>
 
 namespace adaptive
 {
diff --git a/modules/demux/adaptive/plumbing/CommandsQueue.hpp b/modules/demux/adaptive/plumbing/CommandsQueue.hpp
index 50ff75bbd4..d5c6ffa08f 100644
--- a/modules/demux/adaptive/plumbing/CommandsQueue.hpp
+++ b/modules/demux/adaptive/plumbing/CommandsQueue.hpp
@@ -21,6 +21,7 @@
 #define COMMANDSQUEUE_HPP_
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_es.h>
 
 #include <atomic>
diff --git a/modules/demux/adaptive/plumbing/FakeESOut.hpp b/modules/demux/adaptive/plumbing/FakeESOut.hpp
index 3c434a7333..f952696caa 100644
--- a/modules/demux/adaptive/plumbing/FakeESOut.hpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.hpp
@@ -21,6 +21,7 @@
 #define FAKEESOUT_HPP
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <list>
 
 namespace adaptive
diff --git a/modules/hw/d3d11/d3d11_instance.c b/modules/hw/d3d11/d3d11_instance.c
index 373bd8a0e1..0450a97522 100644
--- a/modules/hw/d3d11/d3d11_instance.c
+++ b/modules/hw/d3d11/d3d11_instance.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <vlc_filter.h>
+#include <vlc_threads.h>
 #include <vlc_picture.h>
 
 #include <assert.h>
diff --git a/modules/hw/d3d11/d3d11_surface.c b/modules/hw/d3d11/d3d11_surface.c
index 1a468cb726..1dcee6a711 100644
--- a/modules/hw/d3d11/d3d11_surface.c
+++ b/modules/hw/d3d11/d3d11_surface.c
@@ -29,6 +29,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
 #include <vlc_modules.h>
diff --git a/modules/hw/d3d9/d3d9_instance.c b/modules/hw/d3d9/d3d9_instance.c
index 81dc704b26..5b4a836557 100644
--- a/modules/hw/d3d9/d3d9_instance.c
+++ b/modules/hw/d3d9/d3d9_instance.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <vlc_filter.h>
+#include <vlc_threads.h>
 #include <vlc_picture.h>
 
 #include <assert.h>
diff --git a/modules/hw/vaapi/filters.c b/modules/hw/vaapi/filters.c
index 364519bc7c..f0205f93a7 100644
--- a/modules/hw/vaapi/filters.c
+++ b/modules/hw/vaapi/filters.c
@@ -27,6 +27,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_atomic.h>
 #include <vlc_filter.h>
 #include <vlc_plugin.h>
diff --git a/modules/keystore/file.c b/modules/keystore/file.c
index b607185583..622e2a705d 100644
--- a/modules/keystore/file.c
+++ b/modules/keystore/file.c
@@ -30,6 +30,9 @@
 #ifdef HAVE_FCNTL
 #include <fcntl.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
diff --git a/modules/keystore/memory.c b/modules/keystore/memory.c
index 527433db9a..00cf1eddda 100644
--- a/modules/keystore/memory.c
+++ b/modules/keystore/memory.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_keystore.h>
 #include <vlc_strings.h>
diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c
index 27bdfaa22a..830b012715 100644
--- a/modules/misc/inhibit/xdg.c
+++ b/modules/misc/inhibit/xdg.c
@@ -23,6 +23,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_inhibit.h>
 #include <assert.h>
diff --git a/modules/services_discovery/upnp-wrapper.cpp b/modules/services_discovery/upnp-wrapper.cpp
index 52c942cb3d..e67c30f3eb 100644
--- a/modules/services_discovery/upnp-wrapper.cpp
+++ b/modules/services_discovery/upnp-wrapper.cpp
@@ -29,6 +29,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 2281b3aa1a..c63326287e 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -29,6 +29,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 
 #include "upnp.hpp"
 
diff --git a/modules/spu/audiobargraph_v.c b/modules/spu/audiobargraph_v.c
index d64d41e952..36da87594f 100644
--- a/modules/spu/audiobargraph_v.c
+++ b/modules/spu/audiobargraph_v.c
@@ -32,6 +32,7 @@
 #include <math.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_subpicture.h>
diff --git a/modules/spu/dynamicoverlay/dynamicoverlay.h b/modules/spu/dynamicoverlay/dynamicoverlay.h
index 138b970656..198bd7ff06 100644
--- a/modules/spu/dynamicoverlay/dynamicoverlay.h
+++ b/modules/spu/dynamicoverlay/dynamicoverlay.h
@@ -25,6 +25,7 @@
 #define DYNAMIC_OVERLAY_H   1
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_filter.h>
 #include <vlc_text_style.h>
 
diff --git a/modules/spu/logo.c b/modules/spu/logo.c
index fb062f3414..9c5cf0cc21 100644
--- a/modules/spu/logo.c
+++ b/modules/spu/logo.c
@@ -32,6 +32,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_mouse.h>
diff --git a/modules/spu/mosaic.c b/modules/spu/mosaic.c
index e08ae7794f..e5a951b4cf 100644
--- a/modules/spu/mosaic.c
+++ b/modules/spu/mosaic.c
@@ -33,6 +33,7 @@
 #include <limits.h> /* INT_MAX */
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_image.h>
diff --git a/modules/spu/subsdelay.c b/modules/spu/subsdelay.c
index 33ac819329..8130916239 100644
--- a/modules/spu/subsdelay.c
+++ b/modules/spu/subsdelay.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_subpicture.h>
diff --git a/modules/text_renderer/freetype/fonts/fontconfig.c b/modules/text_renderer/freetype/fonts/fontconfig.c
index 0485bc210f..d8d7fae0a1 100644
--- a/modules/text_renderer/freetype/fonts/fontconfig.c
+++ b/modules/text_renderer/freetype/fonts/fontconfig.c
@@ -38,6 +38,7 @@
 #include <stdint.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_filter.h>                     /* filter_sys_t */
 #include <vlc_dialog.h>                     /* FcCache dialog */
 
diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index e0af31cd3a..f2194be5ce 100644
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 
 #include <vlc_image.h>
diff --git a/modules/video_filter/ball.c b/modules/video_filter/ball.c
index 7a588cd14c..af658479ff 100644
--- a/modules/video_filter/ball.c
+++ b/modules/video_filter/ball.c
@@ -37,6 +37,7 @@
 #include <math.h> /* sin(), cos(), asin() */
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_picture.h>
 #include <vlc_filter.h>
diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c
index ac9e101af1..28754c8709 100644
--- a/modules/video_filter/bluescreen.c
+++ b/modules/video_filter/bluescreen.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c
index ad8d458108..5dff2dfbf5 100644
--- a/modules/video_filter/extract.c
+++ b/modules/video_filter/extract.c
@@ -32,6 +32,7 @@
 #include <math.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
diff --git a/modules/video_filter/gradfun.c b/modules/video_filter/gradfun.c
index 5a574de3c7..157924d283 100644
--- a/modules/video_filter/gradfun.c
+++ b/modules/video_filter/gradfun.c
@@ -32,6 +32,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_cpu.h>
 #include <vlc_filter.h>
diff --git a/modules/video_filter/grain.c b/modules/video_filter/grain.c
index 49e8024ebc..83eb410186 100644
--- a/modules/video_filter/grain.c
+++ b/modules/video_filter/grain.c
@@ -32,6 +32,7 @@
 #include <math.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_cpu.h>
diff --git a/modules/video_filter/hqdn3d.c b/modules/video_filter/hqdn3d.c
index 43cbba0103..cafa99aed1 100644
--- a/modules/video_filter/hqdn3d.c
+++ b/modules/video_filter/hqdn3d.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
diff --git a/modules/video_filter/magnify.c b/modules/video_filter/magnify.c
index 9a2cf876a7..dcfaeebf63 100644
--- a/modules/video_filter/magnify.c
+++ b/modules/video_filter/magnify.c
@@ -32,6 +32,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_image.h>
 #include <vlc_filter.h>
diff --git a/modules/video_filter/oldmovie.c b/modules/video_filter/oldmovie.c
index eb418b869e..fa852301e8 100644
--- a/modules/video_filter/oldmovie.c
+++ b/modules/video_filter/oldmovie.c
@@ -32,6 +32,7 @@
 #include <math.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index 6b4fbfb133..70e92c455b 100644
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -36,6 +36,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
diff --git a/modules/video_filter/puzzle.h b/modules/video_filter/puzzle.h
index 2b9da63da7..6fd57816ec 100644
--- a/modules/video_filter/puzzle.h
+++ b/modules/video_filter/puzzle.h
@@ -26,6 +26,7 @@
 #define VLC_PUZZLE_H 1
 
 #include "puzzle_mgt.h"
+#include <vlc_threads.h>
 
 struct filter_sys_t {
     bool b_init;
diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c
index 1367162e7c..444add241e 100644
--- a/modules/video_filter/ripple.c
+++ b/modules/video_filter/ripple.c
@@ -33,6 +33,7 @@
 #include <math.h>                                            /* sin(), cos() */
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
diff --git a/modules/video_filter/vhs.c b/modules/video_filter/vhs.c
index 43c56d760f..2918e6c261 100644
--- a/modules/video_filter/vhs.c
+++ b/modules/video_filter/vhs.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c
index d6f4c32dde..f610b613ac 100644
--- a/modules/video_filter/wave.c
+++ b/modules/video_filter/wave.c
@@ -33,6 +33,7 @@
 #include <math.h>                                            /* sin(), cos() */
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include <vlc_picture.h>
diff --git a/modules/video_output/drawable.c b/modules/video_output/drawable.c
index 71c897328b..e66c53d4d1 100644
--- a/modules/video_output/drawable.c
+++ b/modules/video_output/drawable.c
@@ -28,6 +28,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_vout_window.h>
 
diff --git a/modules/video_output/vdummy.c b/modules/video_output/vdummy.c
index 887740122a..e82b5dfd9e 100644
--- a/modules/video_output/vdummy.c
+++ b/modules/video_output/vdummy.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index d3def81868..f12b352f72 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -41,6 +41,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 #include <vlc_charset.h> /* ToT function */
diff --git a/modules/video_output/win32/directdraw.c b/modules/video_output/win32/directdraw.c
index 121c0563e9..76370c44b4 100644
--- a/modules/video_output/win32/directdraw.c
+++ b/modules/video_output/win32/directdraw.c
@@ -42,6 +42,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 #include <vlc_charset.h>    /* FromT */
diff --git a/modules/video_output/win32/events.c b/modules/video_output/win32/events.c
index ecb2451514..29e8c93d53 100644
--- a/modules/video_output/win32/events.c
+++ b/modules/video_output/win32/events.c
@@ -34,6 +34,7 @@
 #include "win32touch.h"
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_vout_display.h>
 
 #include <stdatomic.h>
diff --git a/modules/video_output/win32/inhibit.c b/modules/video_output/win32/inhibit.c
index 77e21f0984..4ecc006f19 100644
--- a/modules/video_output/win32/inhibit.c
+++ b/modules/video_output/win32/inhibit.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_inhibit.h>
 #include <vlc_plugin.h>
 #include <assert.h>
diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index 6152d420ce..6727ca58f3 100644
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -40,6 +40,7 @@ typedef xcb_atom_t Atom;
 #include <X11/Xatom.h> /* XA_WM_NAME */
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <vlc_vout_window.h>
 
diff --git a/src/config/configuration.h b/src/config/configuration.h
index ec19abc89e..b5cfe300f2 100644
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -21,6 +21,8 @@
 #ifndef LIBVLC_CONFIGURATION_H
 # define LIBVLC_CONFIGURATION_H 1
 
+#include <vlc_threads.h>
+
 # ifdef __cplusplus
 extern "C" {
 # endif
diff --git a/src/config/core.c b/src/config/core.c
index 430aadf9cf..6dcbd3ee5c 100644
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -26,6 +26,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_actions.h>
 #include <vlc_modules.h>
 #include <vlc_plugin.h>
diff --git a/src/config/help.c b/src/config/help.c
index 160c434a36..0934ddbb6c 100644
--- a/src/config/help.c
+++ b/src/config/help.c
@@ -34,6 +34,7 @@
 #include <vlc_modules.h>
 #include <vlc_plugin.h>
 #include <vlc_charset.h>
+#include <vlc_threads.h>
 #include "modules/modules.h"
 #include "config/configuration.h"
 #include "libvlc.h"
diff --git a/src/input/item.c b/src/input/item.c
index ff2532ebfa..1a1b502c39 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -30,6 +30,7 @@
 #include <ctype.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_url.h>
 #include <vlc_interface.h>
 #include <vlc_charset.h>
diff --git a/src/interface/interface.c b/src/interface/interface.c
index 9910463065..2566bf13e7 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -40,6 +40,7 @@
 #include <unistd.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_modules.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
diff --git a/src/linux/cpu.c b/src/linux/cpu.c
index 38fcce98f8..a027f07dfd 100644
--- a/src/linux/cpu.c
+++ b/src/linux/cpu.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_cpu.h>
 
 #undef CPU_FLAGS
diff --git a/src/misc/httpcookies.c b/src/misc/httpcookies.c
index 77ab852b15..ba4a3b3952 100644
--- a/src/misc/httpcookies.c
+++ b/src/misc/httpcookies.c
@@ -31,6 +31,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_messages.h>
 #include <vlc_strings.h>
 #include <vlc_http.h>
diff --git a/src/misc/picture_fifo.c b/src/misc/picture_fifo.c
index ff373fb13b..21c7660924 100644
--- a/src/misc/picture_fifo.c
+++ b/src/misc/picture_fifo.c
@@ -32,6 +32,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_picture_fifo.h>
 
 /*****************************************************************************
diff --git a/src/misc/picture_pool.c b/src/misc/picture_pool.c
index 874a04e4d8..60519b9dec 100644
--- a/src/misc/picture_pool.c
+++ b/src/misc/picture_pool.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_picture_pool.h>
 #include "picture.h"
 
diff --git a/src/misc/rand.c b/src/misc/rand.c
index 0c6ab65146..afc805d487 100644
--- a/src/misc/rand.c
+++ b/src/misc/rand.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_rand.h>
 
 static struct
diff --git a/src/misc/threads.c b/src/misc/threads.c
index 9e99ab0d02..ccfc62998a 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 
 /*** Global locks ***/
 
diff --git a/src/modules/entry.c b/src/modules/entry.c
index bce94285c6..7d90b85284 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_plugin.h>
 #include <assert.h>
 #include <stdarg.h>
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 400396a41f..4783b99859 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_arrays.h>
 #include <vlc_sout.h>
 #include <vlc_playlist.h>
diff --git a/src/posix/timer.c b/src/posix/timer.c
index 9acd51db8f..9e0f9c270b 100644
--- a/src/posix/timer.c
+++ b/src/posix/timer.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 
 /*
  * POSIX timers are essentially unusable from a library: there provide no safe
diff --git a/src/video_output/snapshot.h b/src/video_output/snapshot.h
index 9b928d6cf0..40bc04ccf3 100644
--- a/src/video_output/snapshot.h
+++ b/src/video_output/snapshot.h
@@ -25,6 +25,7 @@
 #define LIBVLC_VOUT_INTERNAL_SNAPSHOT_H
 
 #include <vlc_picture.h>
+#include <vlc_threads.h>
 
 typedef struct {
     vlc_mutex_t lock;
diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index 10de062aa8..eb3179c7b1 100644
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -28,6 +28,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_vout.h>
 #include <vlc_vout_osd.h>
 
diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c
index ae75baef41..ae0611b5ef 100644
--- a/src/video_output/video_widgets.c
+++ b/src/video_output/video_widgets.c
@@ -31,6 +31,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
+#include <vlc_threads.h>
 #include <vlc_vout.h>
 #include <vlc_vout_osd.h>
 
diff --git a/src/win32/timer.c b/src/win32/timer.c
index ba37d4b78f..cb94c8583d 100644
--- a/src/win32/timer.c
+++ b/src/win32/timer.c
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <windows.h>
 #include <vlc_common.h>
+#include <vlc_threads.h>
 
 struct vlc_timer
 {
-- 
2.18.0



More information about the vlc-devel mailing list