Commit 19570f8a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

DVB access: remove outdated defines

parent 6b18ddaa
...@@ -49,25 +49,14 @@ ...@@ -49,25 +49,14 @@
#include <errno.h> #include <errno.h>
/* Include dvbpsi headers */ /* Include dvbpsi headers */
#ifdef HAVE_DVBPSI_DR_H # include <dvbpsi/dvbpsi.h>
# include <dvbpsi/dvbpsi.h> # include <dvbpsi/descriptor.h>
# include <dvbpsi/descriptor.h> # include <dvbpsi/pat.h>
# include <dvbpsi/pat.h> # include <dvbpsi/pmt.h>
# include <dvbpsi/pmt.h> # include <dvbpsi/dr.h>
# include <dvbpsi/dr.h> # include <dvbpsi/psi.h>
# include <dvbpsi/psi.h> # include <dvbpsi/demux.h>
# include <dvbpsi/demux.h> # include <dvbpsi/sdt.h>
# include <dvbpsi/sdt.h>
#else
# include "dvbpsi.h"
# include "descriptor.h"
# include "tables/pat.h"
# include "tables/pmt.h"
# include "descriptors/dr.h"
# include "psi.h"
# include "demux.h"
# include "tables/sdt.h"
#endif
#ifdef ENABLE_HTTPD #ifdef ENABLE_HTTPD
# include <vlc_httpd.h> # include <vlc_httpd.h>
......
...@@ -45,25 +45,14 @@ ...@@ -45,25 +45,14 @@
#include <linux/dvb/ca.h> #include <linux/dvb/ca.h>
/* Include dvbpsi headers */ /* Include dvbpsi headers */
#ifdef HAVE_DVBPSI_DR_H # include <dvbpsi/dvbpsi.h>
# include <dvbpsi/dvbpsi.h> # include <dvbpsi/descriptor.h>
# include <dvbpsi/descriptor.h> # include <dvbpsi/pat.h>
# include <dvbpsi/pat.h> # include <dvbpsi/pmt.h>
# include <dvbpsi/pmt.h> # include <dvbpsi/dr.h>
# include <dvbpsi/dr.h> # include <dvbpsi/psi.h>
# include <dvbpsi/psi.h> # include <dvbpsi/demux.h>
# include <dvbpsi/demux.h> # include <dvbpsi/sdt.h>
# include <dvbpsi/sdt.h>
#else
# include "dvbpsi.h"
# include "descriptor.h"
# include "tables/pat.h"
# include "tables/pmt.h"
# include "descriptors/dr.h"
# include "psi.h"
# include "demux.h"
# include "tables/sdt.h"
#endif
#ifdef ENABLE_HTTPD #ifdef ENABLE_HTTPD
# include <vlc_httpd.h> # include <vlc_httpd.h>
......
...@@ -38,25 +38,14 @@ ...@@ -38,25 +38,14 @@
#include <sys/types.h> #include <sys/types.h>
/* Include dvbpsi headers */ /* Include dvbpsi headers */
#ifdef HAVE_DVBPSI_DR_H # include <dvbpsi/dvbpsi.h>
# include <dvbpsi/dvbpsi.h> # include <dvbpsi/descriptor.h>
# include <dvbpsi/descriptor.h> # include <dvbpsi/pat.h>
# include <dvbpsi/pat.h> # include <dvbpsi/pmt.h>
# include <dvbpsi/pmt.h> # include <dvbpsi/dr.h>
# include <dvbpsi/dr.h> # include <dvbpsi/psi.h>
# include <dvbpsi/psi.h> # include <dvbpsi/demux.h>
# include <dvbpsi/demux.h> # include <dvbpsi/sdt.h>
# include <dvbpsi/sdt.h>
#else
# include "dvbpsi.h"
# include "descriptor.h"
# include "tables/pat.h"
# include "tables/pmt.h"
# include "descriptors/dr.h"
# include "psi.h"
# include "demux.h"
# include "tables/sdt.h"
#endif
#ifdef ENABLE_HTTPD #ifdef ENABLE_HTTPD
# include <vlc_httpd.h> # include <vlc_httpd.h>
......
...@@ -48,25 +48,14 @@ ...@@ -48,25 +48,14 @@
#include <linux/dvb/ca.h> #include <linux/dvb/ca.h>
/* Include dvbpsi headers */ /* Include dvbpsi headers */
#ifdef HAVE_DVBPSI_DR_H # include <dvbpsi/dvbpsi.h>
# include <dvbpsi/dvbpsi.h> # include <dvbpsi/descriptor.h>
# include <dvbpsi/descriptor.h> # include <dvbpsi/pat.h>
# include <dvbpsi/pat.h> # include <dvbpsi/pmt.h>
# include <dvbpsi/pmt.h> # include <dvbpsi/dr.h>
# include <dvbpsi/dr.h> # include <dvbpsi/psi.h>
# include <dvbpsi/psi.h> # include <dvbpsi/demux.h>
# include <dvbpsi/demux.h> # include <dvbpsi/sdt.h>
# include <dvbpsi/sdt.h>
#else
# include "dvbpsi.h"
# include "descriptor.h"
# include "tables/pat.h"
# include "tables/pmt.h"
# include "descriptors/dr.h"
# include "psi.h"
# include "demux.h"
# include "tables/sdt.h"
#endif
#ifdef ENABLE_HTTPD #ifdef ENABLE_HTTPD
# include <vlc_httpd.h> # include <vlc_httpd.h>
......
...@@ -42,25 +42,14 @@ ...@@ -42,25 +42,14 @@
#include <poll.h> #include <poll.h>
/* Include dvbpsi headers */ /* Include dvbpsi headers */
#ifdef HAVE_DVBPSI_DR_H # include <dvbpsi/dvbpsi.h>
# include <dvbpsi/dvbpsi.h> # include <dvbpsi/descriptor.h>
# include <dvbpsi/descriptor.h> # include <dvbpsi/pat.h>
# include <dvbpsi/pat.h> # include <dvbpsi/pmt.h>
# include <dvbpsi/pmt.h> # include <dvbpsi/dr.h>
# include <dvbpsi/dr.h> # include <dvbpsi/psi.h>
# include <dvbpsi/psi.h> # include <dvbpsi/demux.h>
# include <dvbpsi/demux.h> # include <dvbpsi/sdt.h>
# include <dvbpsi/sdt.h>
#else
# include "dvbpsi.h"
# include "descriptor.h"
# include "tables/pat.h"
# include "tables/pmt.h"
# include "descriptors/dr.h"
# include "psi.h"
# include "demux.h"
# include "tables/sdt.h"
#endif
#ifdef ENABLE_HTTPD #ifdef ENABLE_HTTPD
# include <vlc_httpd.h> # include <vlc_httpd.h>
......
...@@ -21,17 +21,10 @@ ...@@ -21,17 +21,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_DVBPSI_DR_H
#ifdef _DVBPSI_DR_43_H_ #ifdef _DVBPSI_DR_43_H_
# define DVBPSI_USE_NIT 1 # define DVBPSI_USE_NIT 1
# include <dvbpsi/nit.h> # include <dvbpsi/nit.h>
#endif #endif
#else
#ifdef _DVBPSI_DR_43_H_
# define DVBPSI_USE_NIT 1
# include "nit.h"
#endif
#endif
#ifndef DVBPSI_USE_NIT #ifndef DVBPSI_USE_NIT
# warning NIT is not supported by your libdvbpsi version # warning NIT is not supported by your libdvbpsi version
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment