sectionsd: fix compilation after include change.

src/sectionsd/Makefile.am

@@ -1,4 +1,5 @@
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \

src/sectionsd/SIevents.cpp

@@ -45,7 +45,7 @@
 #include "SInetworks.hpp"
 #endif
 #include "SIsections.hpp"
-#include <dmxapi.h>
+#include "dmxapi.h"
 
 const std::string languangeOFF = "OFF";
 

src/sectionsd/SIsections.cpp

@@ -42,12 +42,12 @@
 #include "SInetworks.hpp"
 #endif
 #include "SIsections.hpp"
-#include <dmxapi.h>
 #include <zapit/dvbstring.h>
-#include <edvbstring.h>
 #ifdef ENABLE_FREESATEPG
 #include "FreesatTables.hpp"
 #endif
+#include "dmxapi.h"
+#include "edvbstring.h"
 
 #define NOVA		0x3ffe
 #define CANALDIGITAAL	0x3fff

src/sectionsd/dmx.cpp

@@ -23,9 +23,6 @@
  */
 
 
-#include <dmx.h>
-#include <dmxapi.h>
-#include <debug.h>
 
 #include <endian.h>
 #include <errno.h>
@@ -40,6 +37,9 @@
 
 #include <driver/abstime.h>
 
+#include "dmx.h"
+#include "dmxapi.h"
+#include "debug.h"
 /*
 #define DEBUG_MUTEX 1
 #define DEBUG_CACHED_SECTIONS 1

src/sectionsd/dmx.h

@@ -24,17 +24,13 @@
 #ifndef __sectionsd__dmx_h__
 #define __sectionsd__dmx_h__
 
+#include <config.h>
+
 #include <pthread.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <vector>
-#include <config.h>
+#include <dmx.h>
-#if HAVE_COOL_HARDWARE
-#include <dmx_cs.h>
-#endif
-#if HAVE_TRIPLEDRAGON
-#include <dmx_td.h>
-#endif
 
 typedef uint64_t sections_id_t;
 typedef unsigned char version_number_t;

src/sectionsd/dmxapi.cpp

@@ -30,14 +30,9 @@
 #include <unistd.h>        /* close, read */
 #include <arpa/inet.h>     /* htons */
 #include <time.h>          /* ctime */
-#include <dmxapi.h>
+#include "dmxapi.h"
-
-#if HAVE_TRIPLEDRAGON
-#include <dmx_td.h>
-#else
-#include <dmx_cs.h>
-#endif
 
+#include <dmx.h>
 #include "SIutils.hpp"
 #include "debug.h"
 

src/sectionsd/edvbstring.cpp

@@ -1,9 +1,9 @@
 #include <string>
 #include <ctype.h>
 #include <limits.h>
-#include <debug.h>
 #include <map>
 #include <set>
+#include "debug.h"
 
 std::map<std::string, int> CountryCodeDefaultMapping;
 std::map<int, int> TransponderDefaultMapping;

src/sectionsd/sectionsd.cpp

@@ -29,9 +29,6 @@
 
 #include <config.h>
 #include <malloc.h>
-#include <dmxapi.h>
-#include <dmx.h>
-#include <debug.h>
 
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -88,6 +85,11 @@
 #include "SIlanguage.hpp"
 
 #include "edvbstring.h"
+#include "dmxapi.h"
+#include "dmx.h"
+#include "debug.h"
+
+
 //#include "timerdclient.h"
 //#include "../timermanager.h"