diff options
| author | louis <louis.braun@gmx.de> | 2016-02-01 17:02:07 +0100 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2016-02-01 17:02:07 +0100 |
| commit | 0aecaca5f887200f91141125b47597dda29d5515 (patch) | |
| tree | 07688b5025771c6a454b739c388deecc27db8f83 | |
| parent | 9d2206fc5999a24bd64d6f0ce976b4c6f8ce9b33 (diff) | |
| download | vdr-plugin-skindesigner-0aecaca5f887200f91141125b47597dda29d5515.tar.gz vdr-plugin-skindesigner-0aecaca5f887200f91141125b47597dda29d5515.tar.bz2 | |
fixed some possible compiling errors
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | coreengine/functions.c | 1 | ||||
| -rw-r--r-- | coreengine/viewelementsdisplaymenu.c | 1 | ||||
| -rw-r--r-- | displayreplay.c | 1 | ||||
| -rw-r--r-- | extensions/pluginmanager.h | 4 | ||||
| -rw-r--r-- | services/epgsearch.h | 2 |
6 files changed, 4 insertions, 6 deletions
@@ -46,6 +46,7 @@ SOFILE = libvdr-$(PLUGIN).so DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' $(CONFIG) DEFINES += $(shell xml2-config --cflags) DEFINES += -DSCRIPTFOLDER='"$(SKINDESIGNER_SCRIPTDIR)"' +DEFINES += -D__STL_CONFIG_H INCLUDES += $(shell pkg-config --cflags freetype2 fontconfig) INCLUDES += $(shell pkg-config --cflags librsvg-2.0 cairo-png) -ljpeg diff --git a/coreengine/functions.c b/coreengine/functions.c index f8b8d47..054304e 100644 --- a/coreengine/functions.c +++ b/coreengine/functions.c @@ -1,4 +1,3 @@ -#define __STL_CONFIG_H
#include "attribute.h"
#include "../config.h"
diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c index 52e2996..bbc6783 100644 --- a/coreengine/viewelementsdisplaymenu.c +++ b/coreengine/viewelementsdisplaymenu.c @@ -1,4 +1,3 @@ -#define __STL_CONFIG_H
#include "viewelementsdisplaymenu.h"
#include "../config.h"
#include <vdr/videodir.h>
diff --git a/displayreplay.c b/displayreplay.c index 02df55a..6b585aa 100644 --- a/displayreplay.c +++ b/displayreplay.c @@ -1,4 +1,3 @@ -#define __STL_CONFIG_H #include "displayreplay.h" cSDDisplayReplay::cSDDisplayReplay(cViewReplay *replayView, bool ModeOnly) { diff --git a/extensions/pluginmanager.h b/extensions/pluginmanager.h index 399c1d8..a3790ad 100644 --- a/extensions/pluginmanager.h +++ b/extensions/pluginmanager.h @@ -3,7 +3,7 @@ #include <string>
#include <map>
-#include "libskindesignerapi/skindesignerapi.h"
+#include "../libskindesignerapi/skindesignerapi.h"
using namespace std;
@@ -68,4 +68,4 @@ public: skindesignerapi::cTokenContainer *GetTokenContainerTab(int plugId, int viewId);
};
-#endif //__PLUGINMANAGER_H
\ No newline at end of file +#endif //__PLUGINMANAGER_H
diff --git a/services/epgsearch.h b/services/epgsearch.h index 0c38793..aea32e7 100644 --- a/services/epgsearch.h +++ b/services/epgsearch.h @@ -161,7 +161,7 @@ class cServiceHandler struct Epgsearch_services_v1_0 { // in/out - std::auto_ptr<cServiceHandler> handler; + std::unique_ptr<cServiceHandler> handler; }; #endif |