From 42a47ac8dcacb9daafa5c63b7f085df8b0bf708e Mon Sep 17 00:00:00 2001
From: "[CST] Bas" <bas@coolstreamtech.com>
Date: Sun, 4 Mar 2012 15:49:44 +0800
Subject: [PATCH] sectionsd: fix compilation after include change.

---
 src/sectionsd/Makefile.am    |  1 +
 src/sectionsd/SIevents.cpp   |  2 +-
 src/sectionsd/SIsections.cpp |  4 ++--
 src/sectionsd/dmx.cpp        |  6 +++---
 src/sectionsd/dmx.h          | 10 +++-------
 src/sectionsd/dmxapi.cpp     |  9 ++-------
 src/sectionsd/edvbstring.cpp |  2 +-
 src/sectionsd/sectionsd.cpp  |  8 +++++---
 8 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/sectionsd/Makefile.am b/src/sectionsd/Makefile.am
index 200019dbe..813ed0596 100644
--- a/src/sectionsd/Makefile.am
+++ b/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 \
diff --git a/src/sectionsd/SIevents.cpp b/src/sectionsd/SIevents.cpp
index 28808a185..136e134c2 100644
--- a/src/sectionsd/SIevents.cpp
+++ b/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";
 
diff --git a/src/sectionsd/SIsections.cpp b/src/sectionsd/SIsections.cpp
index fa5d7aa43..fc34200f3 100644
--- a/src/sectionsd/SIsections.cpp
+++ b/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
diff --git a/src/sectionsd/dmx.cpp b/src/sectionsd/dmx.cpp
index 45eb54661..b56158b6d 100644
--- a/src/sectionsd/dmx.cpp
+++ b/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
diff --git a/src/sectionsd/dmx.h b/src/sectionsd/dmx.h
index a0209bad8..856e1bcdb 100644
--- a/src/sectionsd/dmx.h
+++ b/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>
-#if HAVE_COOL_HARDWARE
-#include <dmx_cs.h>
-#endif
-#if HAVE_TRIPLEDRAGON
-#include <dmx_td.h>
-#endif
+#include <dmx.h>
 
 typedef uint64_t sections_id_t;
 typedef unsigned char version_number_t;
diff --git a/src/sectionsd/dmxapi.cpp b/src/sectionsd/dmxapi.cpp
index 953200509..2e00e586f 100644
--- a/src/sectionsd/dmxapi.cpp
+++ b/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>
-
-#if HAVE_TRIPLEDRAGON
-#include <dmx_td.h>
-#else
-#include <dmx_cs.h>
-#endif
+#include "dmxapi.h"
 
+#include <dmx.h>
 #include "SIutils.hpp"
 #include "debug.h"
 
diff --git a/src/sectionsd/edvbstring.cpp b/src/sectionsd/edvbstring.cpp
index 62bc05b77..3f8ad1b41 100644
--- a/src/sectionsd/edvbstring.cpp
+++ b/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;
diff --git a/src/sectionsd/sectionsd.cpp b/src/sectionsd/sectionsd.cpp
index efca3dbf9..45292c01c 100644
--- a/src/sectionsd/sectionsd.cpp
+++ b/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"