[vlc-commits] access: dtv: fix local include pathes

Steve Lhomme git at videolan.org
Mon Jul 15 11:27:35 CEST 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul 15 08:14:37 2019 +0200| [2b384b5d15e244dfa85b3837283e7688e85824d5] | committer: Steve Lhomme

access: dtv: fix local include pathes

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

 modules/access/dtv/access.c     | 2 +-
 modules/access/dtv/bdagraph.cpp | 4 ++--
 modules/access/dtv/bdagraph.hpp | 2 +-
 modules/access/dtv/en50221.c    | 6 +++---
 modules/access/dtv/linux.c      | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index 0a4b0ae3c1..55a320ceb9 100644
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -32,7 +32,7 @@
 #include <search.h>
 #endif
 
-#include "dtv/dtv.h"
+#include "dtv.h"
 
 #define ADAPTER_TEXT N_("DVB adapter")
 #define ADAPTER_LONGTEXT N_( \
diff --git a/modules/access/dtv/bdagraph.cpp b/modules/access/dtv/bdagraph.cpp
index bd548ad1fc..77d42ee56c 100644
--- a/modules/access/dtv/bdagraph.cpp
+++ b/modules/access/dtv/bdagraph.cpp
@@ -33,8 +33,8 @@
 
 #include <vlc_common.h>
 #include <vlc_block.h>
-#include "dtv/bdagraph.hpp"
-#include "dtv/dtv.h"
+#include "bdagraph.hpp"
+#include "dtv.h"
 #undef DEBUG_MONIKER_NAME
 
 static ModulationType dvb_parse_modulation (const char *mod)
diff --git a/modules/access/dtv/bdagraph.hpp b/modules/access/dtv/bdagraph.hpp
index df34bdfdc8..e220056c7d 100644
--- a/modules/access/dtv/bdagraph.hpp
+++ b/modules/access/dtv/bdagraph.hpp
@@ -35,7 +35,7 @@
 #include <dshow.h>
 
 #include <comcat.h>
-#include "dtv/bdadefs.h"
+#include "bdadefs.h"
 #include <stdexcept>
 
 
diff --git a/modules/access/dtv/en50221.c b/modules/access/dtv/en50221.c
index 6126b5d7f2..97512d3f38 100644
--- a/modules/access/dtv/en50221.c
+++ b/modules/access/dtv/en50221.c
@@ -47,9 +47,9 @@
 #   include <vlc_httpd.h>
 #endif
 
-#include "../demux/dvb-text.h"
-#include "dtv/en50221.h"
-#include "dtv/en50221_capmt.h"
+#include "../../demux/dvb-text.h"
+#include "en50221.h"
+#include "en50221_capmt.h"
 
 typedef struct en50221_session_t
 {
diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c
index 8a8d7206b4..3245594d4f 100644
--- a/modules/access/dtv/linux.c
+++ b/modules/access/dtv/linux.c
@@ -38,8 +38,8 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/dmx.h>
 
-#include "dtv/dtv.h"
-#include "dtv/en50221.h"
+#include "dtv.h"
+#include "en50221.h"
 
 #ifndef O_SEARCH
 # define O_SEARCH O_RDONLY



More information about the vlc-commits mailing list