[vlc-commits] DVB: useless includes

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar  5 15:58:16 2011 +0200| [5b15af4f565233a559bfbc589127408ff4a8ae17] | committer: Rémi Denis-Courmont

DVB: useless includes

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

 modules/access/dvb/access.c    |   10 ----------
 modules/access/dvb/dvb.h       |    8 --------
 modules/access/dvb/en50221.c   |   12 +++---------
 modules/access/dvb/http.c      |   13 +++----------
 modules/access/dvb/linux_dvb.c |   12 ++++++++----
 modules/access/dvb/scan.c      |   12 +-----------
 6 files changed, 15 insertions(+), 52 deletions(-)

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index f4f2e1a..2bcb2d4 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -36,12 +36,6 @@
 #include <vlc_plugin.h>
 #include <vlc_access.h>
 #include <vlc_input.h>
-#include <vlc_interface.h>
-#include <vlc_fs.h>
-
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
 
 #include <sys/types.h>
 #include <poll.h>
@@ -58,10 +52,6 @@
 # include <dvbpsi/demux.h>
 # include <dvbpsi/sdt.h>
 
-#ifdef ENABLE_HTTPD
-#   include <vlc_httpd.h>
-#endif
-
 #include "dvb.h"
 
 /*****************************************************************************
diff --git a/modules/access/dvb/dvb.h b/modules/access/dvb/dvb.h
index 90f3aaa..57ccfbf 100644
--- a/modules/access/dvb/dvb.h
+++ b/modules/access/dvb/dvb.h
@@ -27,14 +27,6 @@
 #include "scan.h"
 
 /*****************************************************************************
- * Devices location
- *****************************************************************************/
-#define DMX      "/dev/dvb/adapter%d/demux%d"
-#define FRONTEND "/dev/dvb/adapter%d/frontend%d"
-#define DVR      "/dev/dvb/adapter%d/dvr%d"
-#define CA       "/dev/dvb/adapter%d/ca%d"
-
-/*****************************************************************************
  * Local structures
  *****************************************************************************/
 typedef struct demux_handle_t
diff --git a/modules/access/dvb/en50221.c b/modules/access/dvb/en50221.c
index 0097ea9..d076214 100644
--- a/modules/access/dvb/en50221.c
+++ b/modules/access/dvb/en50221.c
@@ -28,20 +28,16 @@
 
 #include <vlc_common.h>
 #include <vlc_access.h>
+#include <vlc_charset.h>
 
-#include <sys/ioctl.h>
 #include <errno.h>
-
-#include <sys/types.h>
 #include <time.h>
-#include <unistd.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
 #include <poll.h>
 #include <netinet/in.h>
 
 /* DVB Card Drivers */
-#include <linux/dvb/version.h>
-#include <linux/dvb/dmx.h>
-#include <linux/dvb/frontend.h>
 #include <linux/dvb/ca.h>
 
 /* Include dvbpsi headers */
@@ -60,8 +56,6 @@
 
 #include "dvb.h"
 
-#include <vlc_charset.h>
-
 #undef DEBUG_TPDU
 #define HLCI_WAIT_CAM_READY 0
 #define CAM_PROG_MAX MAX_PROGRAMS
diff --git a/modules/access/dvb/http.c b/modules/access/dvb/http.c
index 2a1f8e9..9b34ae0 100644
--- a/modules/access/dvb/http.c
+++ b/modules/access/dvb/http.c
@@ -28,12 +28,11 @@
 # include "config.h"
 #endif
 
+#ifdef ENABLE_HTTPD
 #include <vlc_common.h>
 #include <vlc_access.h>
-
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <vlc_httpd.h>
+#include <vlc_acl.h>
 
 #include <sys/types.h>
 
@@ -47,14 +46,8 @@
 # include <dvbpsi/demux.h>
 # include <dvbpsi/sdt.h>
 
-#ifdef ENABLE_HTTPD
-#   include <vlc_httpd.h>
-#   include <vlc_acl.h>
-#endif
-
 #include "dvb.h"
 
-#ifdef ENABLE_HTTPD
 struct httpd_file_sys_t
 {
     access_t         *p_access;
diff --git a/modules/access/dvb/linux_dvb.c b/modules/access/dvb/linux_dvb.c
index 02b3456..b84033e 100644
--- a/modules/access/dvb/linux_dvb.c
+++ b/modules/access/dvb/linux_dvb.c
@@ -31,15 +31,14 @@
 
 #include <vlc_common.h>
 #include <vlc_access.h>
-#include <sys/ioctl.h>
-#include <errno.h>
+#include <vlc_fs.h>
 
+#include <errno.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <fcntl.h>
-#include <time.h>
 #include <unistd.h>
 #include <poll.h>
-#include <vlc_fs.h>
 
 /* DVB Card Drivers */
 #include <linux/dvb/version.h>
@@ -63,6 +62,11 @@
 
 #include "dvb.h"
 
+#define DMX      "/dev/dvb/adapter%d/demux%d"
+#define FRONTEND "/dev/dvb/adapter%d/frontend%d"
+#define DVR      "/dev/dvb/adapter%d/dvr%d"
+#define CA       "/dev/dvb/adapter%d/ca%d"
+
 /*
  * Frontends
  */
diff --git a/modules/access/dvb/scan.c b/modules/access/dvb/scan.c
index 50fef73..87ddc72 100644
--- a/modules/access/dvb/scan.c
+++ b/modules/access/dvb/scan.c
@@ -29,17 +29,11 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_access.h>
+#include <vlc_block.h>
 #include <vlc_dialog.h>
 #include <vlc_fs.h>
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-
 #include <sys/types.h>
-#include <poll.h>
 
 /* Include dvbpsi headers */
 # include <dvbpsi/dvbpsi.h>
@@ -51,10 +45,6 @@
 # include <dvbpsi/demux.h>
 # include <dvbpsi/sdt.h>
 
-#ifdef ENABLE_HTTPD
-#   include <vlc_httpd.h>
-#endif
-
 #include "dvb.h"
 
 /* */