From 3ed6033af970c59721ac4c20ca4d70c3e0b4bd9b Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 6 Feb 2015 20:16:50 +0100 Subject: [PATCH] get rid of dmx_td.h include, use dmx_hal.h instead --- src/eitd/dmx.h | 4 ++-- src/zapit/include/dmx.h | 6 ++---- src/zapit/src/capmt.cpp | 3 --- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/eitd/dmx.h b/src/eitd/dmx.h index 7a097b475..33cb55621 100644 --- a/src/eitd/dmx.h +++ b/src/eitd/dmx.h @@ -32,8 +32,8 @@ #if HAVE_COOL_HARDWARE #include #endif -#if HAVE_TRIPLEDRAGON || USE_STB_HAL -#include +#if USE_STB_HAL +#include #endif #include diff --git a/src/zapit/include/dmx.h b/src/zapit/include/dmx.h index 8901560c6..c8f41b8a3 100644 --- a/src/zapit/include/dmx.h +++ b/src/zapit/include/dmx.h @@ -1,11 +1,9 @@ #if HAVE_COOL_HARDWARE #include #elif USE_STB_HAL -#include -#elif HAVE_TRIPLEDRAGON -#include +#include #else -#error neither HAVE_COOL_HARDWARE nor HAVE_TRIPLEDRAGON nor USE_STB_HAL defined. +#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined. #error do you need to include config.h? #endif diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index 7ed24eb44..11348287a 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -30,9 +30,6 @@ #include #include -#ifndef HAVE_COOL_HARDWARE -#include -#endif #include #include