From 22fdf98f4ce8ea6d3a48da5daa0b3c9fe41e13fe Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Mon, 11 Jan 2010 18:56:36 +0200 Subject: [PATCH] Remove useless inclusions --- modules/access/dvb/http.c | 2 -- modules/access/dvb/scan.c | 4 +--- modules/access/jack.c | 1 - modules/access/mmap.c | 1 - modules/access/pvr.c | 1 - modules/access/vcd/cdrom.c | 1 - modules/access_filter/bandwidth.c | 1 - modules/access_filter/dump.c | 1 - modules/access_output/udp.c | 1 - modules/audio_filter/normvol.c | 4 ---- modules/audio_output/file.c | 2 -- modules/audio_output/hd1000a.cpp | 2 -- modules/audio_output/oss.c | 1 - modules/codec/cc.c | 1 - modules/codec/subtitles/subsdec.h | 1 - modules/control/http/http.h | 1 - modules/control/http/mvar.c | 1 + modules/control/http/util.c | 1 + modules/demux/demuxdump.c | 2 -- modules/demux/subtitle.c | 1 - modules/demux/subtitle_asa.c | 2 -- modules/demux/vobsub.c | 1 - modules/gui/beos/VideoOutput.cpp | 2 -- modules/gui/fbosd.c | 1 - modules/gui/macosx/vout.m | 1 - modules/gui/macosx/voutgl.m | 1 - modules/misc/freetype.c | 1 - modules/misc/lua/demux.c | 1 - modules/misc/notify/growl_udp.c | 1 - modules/misc/rtsp.c | 2 -- modules/services_discovery/mtp.c | 1 - modules/services_discovery/podcast.c | 2 -- modules/services_discovery/sap.c | 1 - modules/stream_out/mosaic_bridge.c | 2 -- modules/video_filter/adjust.c | 1 - modules/video_filter/colorthres.c | 1 - modules/video_output/fb.c | 1 - modules/video_output/hd1000v.cpp | 2 -- modules/video_output/omapfb.c | 1 - modules/visualization/goom.c | 2 -- src/control/mediacontrol_audio_video.c | 1 - src/control/mediacontrol_core.c | 1 - src/control/mediacontrol_util.c | 1 - src/input/es_out_timeshift.c | 1 - src/libvlc.c | 1 - src/misc/epg.c | 1 - src/misc/objects.c | 1 - src/network/acl.c | 2 -- src/playlist/loadsave.c | 1 - src/text/charset.c | 1 - src/text/wincp.c | 1 - 51 files changed, 3 insertions(+), 66 deletions(-) diff --git a/modules/access/dvb/http.c b/modules/access/dvb/http.c index 6ea9d789b8..f79216dd94 100644 --- a/modules/access/dvb/http.c +++ b/modules/access/dvb/http.c @@ -38,8 +38,6 @@ #include #include -#include - /* Include dvbpsi headers */ #ifdef HAVE_DVBPSI_DR_H # include diff --git a/modules/access/dvb/scan.c b/modules/access/dvb/scan.c index 4fb409a467..f41364d516 100644 --- a/modules/access/dvb/scan.c +++ b/modules/access/dvb/scan.c @@ -38,9 +38,7 @@ #include #include -#include - -#include +#include /* Include dvbpsi headers */ #ifdef HAVE_DVBPSI_DR_H diff --git a/modules/access/jack.c b/modules/access/jack.c index 1e08c4cebf..a8fcec5c9e 100644 --- a/modules/access/jack.c +++ b/modules/access/jack.c @@ -48,7 +48,6 @@ #include #include -#include #include #include diff --git a/modules/access/mmap.c b/modules/access/mmap.c index cc729bc19f..06092420c8 100644 --- a/modules/access/mmap.c +++ b/modules/access/mmap.c @@ -32,7 +32,6 @@ #include -#include #include #include #include diff --git a/modules/access/pvr.c b/modules/access/pvr.c index 212aa43f17..0247a88dce 100644 --- a/modules/access/pvr.c +++ b/modules/access/pvr.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c index d81706f9fa..78246ea0af 100644 --- a/modules/access/vcd/cdrom.c +++ b/modules/access/vcd/cdrom.c @@ -39,7 +39,6 @@ # include #endif -#include #ifdef HAVE_SYS_TYPES_H # include #endif diff --git a/modules/access_filter/bandwidth.c b/modules/access_filter/bandwidth.c index 43bce412c4..c9507b7808 100644 --- a/modules/access_filter/bandwidth.c +++ b/modules/access_filter/bandwidth.c @@ -27,7 +27,6 @@ #include #include -#include #include diff --git a/modules/access_filter/dump.c b/modules/access_filter/dump.c index c4b0b5ce22..fdb65fcc10 100644 --- a/modules/access_filter/dump.c +++ b/modules/access_filter/dump.c @@ -30,7 +30,6 @@ #include #include -#include #include diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c index dae64f1e47..2733660eeb 100644 --- a/modules/access_output/udp.c +++ b/modules/access_output/udp.c @@ -34,7 +34,6 @@ #include #include -#include #include #include diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c index 77c7ce69fa..6a9dc2700b 100644 --- a/modules/audio_filter/normvol.c +++ b/modules/audio_filter/normvol.c @@ -36,12 +36,8 @@ # include "config.h" #endif -#include /* ENOMEM */ -#include - #include - #include #include diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c index 358cab3a39..79e968508d 100644 --- a/modules/audio_output/file.c +++ b/modules/audio_output/file.c @@ -30,8 +30,6 @@ # include "config.h" #endif -#include - #include #include #include diff --git a/modules/audio_output/hd1000a.cpp b/modules/audio_output/hd1000a.cpp index e532dfafd6..29481707c7 100644 --- a/modules/audio_output/hd1000a.cpp +++ b/modules/audio_output/hd1000a.cpp @@ -26,8 +26,6 @@ *****************************************************************************/ extern "C" { -#include - #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index 47062fe730..38f49c9ffd 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -31,7 +31,6 @@ # include "config.h" #endif -#include /* ENOMEM */ #include /* open(), O_WRONLY */ #include /* ioctl() */ #include /* write(), close() */ diff --git a/modules/codec/cc.c b/modules/codec/cc.c index 0e8ecb592f..3e659cde97 100644 --- a/modules/codec/cc.c +++ b/modules/codec/cc.c @@ -48,7 +48,6 @@ #include #include #include -#include #include #include diff --git a/modules/codec/subtitles/subsdec.h b/modules/codec/subtitles/subsdec.h index 39a06a6b34..11db067373 100644 --- a/modules/codec/subtitles/subsdec.h +++ b/modules/codec/subtitles/subsdec.h @@ -37,7 +37,6 @@ #include #include #include -#include #include diff --git a/modules/control/http/http.h b/modules/control/http/http.h index 3b2381b847..7fabbac7cc 100644 --- a/modules/control/http/http.h +++ b/modules/control/http/http.h @@ -48,7 +48,6 @@ #ifdef HAVE_SYS_STAT_H # include #endif -#include #ifdef HAVE_FCNTL_H # include #endif diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c index e0926f668f..01b6cbfcd5 100644 --- a/modules/control/http/mvar.c +++ b/modules/control/http/mvar.c @@ -28,6 +28,7 @@ #include "http.h" #include +#include /* Utility function for scandir */ static int Filter( const char *foo ) diff --git a/modules/control/http/util.c b/modules/control/http/util.c index f1d06cf8c2..7f21ebc93a 100644 --- a/modules/control/http/util.c +++ b/modules/control/http/util.c @@ -30,6 +30,7 @@ #include #include "http.h" #include +#include /**************************************************************************** * File and directory functions diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c index 56d7427646..7c5db5234e 100644 --- a/modules/demux/demuxdump.c +++ b/modules/demux/demuxdump.c @@ -29,8 +29,6 @@ # include "config.h" #endif -#include - #include #include #include diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 8b77dd3ac4..ce97012366 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -36,7 +36,6 @@ #include #include -#include #ifdef HAVE_SYS_TYPES_H # include #endif diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c index 30d78d10fa..d45c739c55 100644 --- a/modules/demux/subtitle_asa.c +++ b/modules/demux/subtitle_asa.c @@ -35,8 +35,6 @@ #include #include - -#include #ifdef HAVE_SYS_TYPES_H # include #endif diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c index ef5dd3a9c2..49cb27cd14 100644 --- a/modules/demux/vobsub.c +++ b/modules/demux/vobsub.c @@ -32,7 +32,6 @@ #include #include -#include #include #include diff --git a/modules/gui/beos/VideoOutput.cpp b/modules/gui/beos/VideoOutput.cpp index e6538bd854..e7977e80f3 100644 --- a/modules/gui/beos/VideoOutput.cpp +++ b/modules/gui/beos/VideoOutput.cpp @@ -28,8 +28,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ - #include #include #include diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c index fd9febbc85..c74a8fe4a9 100644 --- a/modules/gui/fbosd.c +++ b/modules/gui/fbosd.c @@ -33,7 +33,6 @@ #include #include -#include #include /* free() */ #include /* strerror() */ #include /* open() */ diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index ebc803af14..16c03f2390 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -30,7 +30,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ #include /* free() */ #include diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m index d26001a0b8..abe1a321e6 100644 --- a/modules/gui/macosx/voutgl.m +++ b/modules/gui/macosx/voutgl.m @@ -30,7 +30,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ #include /* free() */ #include diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c index 1aa10954ee..edc9528de5 100644 --- a/modules/misc/freetype.c +++ b/modules/misc/freetype.c @@ -43,7 +43,6 @@ #include #include -#include #include #include FT_FREETYPE_H diff --git a/modules/misc/lua/demux.c b/modules/misc/lua/demux.c index e674998f7b..09d5f89e0a 100644 --- a/modules/misc/lua/demux.c +++ b/modules/misc/lua/demux.c @@ -36,7 +36,6 @@ #include #include -#include /* ENOMEM */ #ifdef HAVE_SYS_STAT_H # include #endif diff --git a/modules/misc/notify/growl_udp.c b/modules/misc/notify/growl_udp.c index 72dfc9c952..7ba388a579 100644 --- a/modules/misc/notify/growl_udp.c +++ b/modules/misc/notify/growl_udp.c @@ -35,7 +35,6 @@ #include #include #include -#include #include /***************************************************************************** diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c index 2cef452fef..131c697433 100644 --- a/modules/misc/rtsp.c +++ b/modules/misc/rtsp.c @@ -43,8 +43,6 @@ #include #include -#include - #ifndef WIN32 # include #endif diff --git a/modules/services_discovery/mtp.c b/modules/services_discovery/mtp.c index 3a4495faf4..f40fd07576 100644 --- a/modules/services_discovery/mtp.c +++ b/modules/services_discovery/mtp.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c index a75f7131eb..19c4a67ee6 100644 --- a/modules/services_discovery/podcast.c +++ b/modules/services_discovery/podcast.c @@ -37,8 +37,6 @@ #include #include -#include /* ENOMEM */ - #ifdef HAVE_UNISTD_H # include #endif diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c index faf15f4726..288d307d33 100644 --- a/modules/services_discovery/sap.c +++ b/modules/services_discovery/sap.c @@ -41,7 +41,6 @@ #include #include -#include #ifdef HAVE_UNISTD_H # include diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c index 5f950e7a94..d39990f701 100644 --- a/modules/stream_out/mosaic_bridge.c +++ b/modules/stream_out/mosaic_bridge.c @@ -30,8 +30,6 @@ # include "config.h" #endif -#include /* ENOMEM */ - #include #include #include diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c index 0f9811b805..35f7e1d824 100644 --- a/modules/video_filter/adjust.c +++ b/modules/video_filter/adjust.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include #include #include diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c index 9fe2690c2e..3ab6d44f3f 100644 --- a/modules/video_filter/colorthres.c +++ b/modules/video_filter/colorthres.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include #include #include diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c index b394cb0e02..c6879f3c11 100644 --- a/modules/video_output/fb.c +++ b/modules/video_output/fb.c @@ -30,7 +30,6 @@ # include "config.h" #endif -#include /* ENOMEM */ #include /* SIGUSR1, SIGUSR2 */ #include /* open() */ #include /* close() */ diff --git a/modules/video_output/hd1000v.cpp b/modules/video_output/hd1000v.cpp index 5b55b0bd22..823a3d4190 100644 --- a/modules/video_output/hd1000v.cpp +++ b/modules/video_output/hd1000v.cpp @@ -25,8 +25,6 @@ * Preamble *****************************************************************************/ extern "C" { -#include /* ENOMEM */ - #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c index 45d77161e4..08105b8562 100644 --- a/modules/video_output/omapfb.c +++ b/modules/video_output/omapfb.c @@ -27,7 +27,6 @@ # include "config.h" #endif -#include /* ENOMEM */ #include /* open() */ #include /* close() */ diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c index f6922ddbd8..6d93663273 100644 --- a/modules/visualization/goom.c +++ b/modules/visualization/goom.c @@ -25,8 +25,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include - #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c index da538cc648..c23b45d826 100644 --- a/src/control/mediacontrol_audio_video.c +++ b/src/control/mediacontrol_audio_video.c @@ -39,7 +39,6 @@ #include /* malloc(), free() */ #include -#include /* ENOMEM */ #include #include diff --git a/src/control/mediacontrol_core.c b/src/control/mediacontrol_core.c index 7fd47341b0..1b66e39e5c 100644 --- a/src/control/mediacontrol_core.c +++ b/src/control/mediacontrol_core.c @@ -41,7 +41,6 @@ #include /* malloc(), free() */ #include -#include /* ENOMEM */ #include #include diff --git a/src/control/mediacontrol_util.c b/src/control/mediacontrol_util.c index 5a802b54a6..de01a8a904 100644 --- a/src/control/mediacontrol_util.c +++ b/src/control/mediacontrol_util.c @@ -35,7 +35,6 @@ #include /* malloc(), free() */ #include -#include /* ENOMEM */ #include #include diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c index dbfe97f9a8..4609347d30 100644 --- a/src/input/es_out_timeshift.c +++ b/src/input/es_out_timeshift.c @@ -30,7 +30,6 @@ #include #include -#include #include #if defined (WIN32) && !defined (UNDER_CE) # include diff --git a/src/libvlc.c b/src/libvlc.c index 3543e96f6b..8952291718 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -43,7 +43,6 @@ #include "modules/modules.h" #include "config/configuration.h" -#include /* ENOMEM */ #include /* sprintf() */ #include #include /* free() */ diff --git a/src/misc/epg.c b/src/misc/epg.c index 3074c77e34..ccf555f341 100644 --- a/src/misc/epg.c +++ b/src/misc/epg.c @@ -30,7 +30,6 @@ #endif #include -#include #include #include diff --git a/src/misc/objects.c b/src/misc/objects.c index 1ddda1ede6..f7eb7db0bc 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -51,7 +51,6 @@ #else # include # include -# include /* ENOSYS */ #endif #include diff --git a/src/network/acl.c b/src/network/acl.c index ee98e3b48b..5c4ffd3058 100644 --- a/src/network/acl.c +++ b/src/network/acl.c @@ -33,8 +33,6 @@ #include #include -#include - #include #include diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index f454f459bd..cd51e82ea9 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -35,7 +35,6 @@ #include #include #include -#include int playlist_Export( playlist_t * p_playlist, const char *psz_filename, playlist_item_t *p_export_root, const char *psz_type ) diff --git a/src/text/charset.c b/src/text/charset.c index 7812cb917e..07b814ee09 100644 --- a/src/text/charset.c +++ b/src/text/charset.c @@ -36,7 +36,6 @@ #endif #ifdef __APPLE__ -# include # include # include #endif diff --git a/src/text/wincp.c b/src/text/wincp.c index 9848d26ac9..66013c4f0d 100644 --- a/src/text/wincp.c +++ b/src/text/wincp.c @@ -35,7 +35,6 @@ #endif #ifdef __APPLE__ -# include # include #endif -- 2.39.2