From 91d49e3fc573c61924fd531a6b2bd4a473a15a4b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 22 Dec 2018 20:17:23 +0100 Subject: [PATCH] introduce ca.h compatibility header file Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1ff464ad79eb4e1c15e5b855ef0d526a83482959 Author: vanhofen Date: 2018-12-22 (Sat, 22 Dec 2018) Origin message was: ------------------ - introduce ca.h compatibility header file ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- lib/hardware/ca.h | 8 ++++++++ src/gui/cam_menu.h | 2 +- src/neutrino.cpp | 4 ++-- src/zapit/include/zapit/zapit.h | 2 +- src/zapit/src/capmt.cpp | 2 +- src/zapit/src/zapit.cpp | 3 +-- 6 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 lib/hardware/ca.h diff --git a/lib/hardware/ca.h b/lib/hardware/ca.h new file mode 100644 index 000000000..9aaff0f0a --- /dev/null +++ b/lib/hardware/ca.h @@ -0,0 +1,8 @@ +#if HAVE_COOL_HARDWARE +#include +#elif USE_STB_HAL +#include +#else +#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined. +#error do you need to include config.h? +#endif diff --git a/src/gui/cam_menu.h b/src/gui/cam_menu.h index 9797f5c4a..06c579fa2 100644 --- a/src/gui/cam_menu.h +++ b/src/gui/cam_menu.h @@ -26,7 +26,7 @@ #include "widget/menue.h" #include "widget/hintbox.h" #include -#include +#include class CCAMMenuHandler : public CMenuTarget, public CChangeObserver diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ccafc9484..127076c23 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -112,9 +112,9 @@ #include #include -#include -#include +#include #include +#include #include #include diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index 3c34da355..3cc7af395 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "client/zapitclient.h" diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index fe5d18ddb..535905365 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 4a68c10c6..e416b1371 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -52,8 +52,6 @@ #include #include -#include - #include #include @@ -64,6 +62,7 @@ #endif #include +#include #include #include