build fix for tripledragon after last merge

Origin commit data
------------------
Branch: ni/coolstream
Commit: c33f5e4993
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-12-22 21:27:03 +01:00
parent 6fae9a0db4
commit cb7bd9b946
2 changed files with 5 additions and 0 deletions

View File

@@ -281,6 +281,8 @@ class CFrameBuffer
void setFbArea(int element, int _x=0, int _y=0, int _dx=0, int _dy=0); void setFbArea(int element, int _x=0, int _y=0, int _dx=0, int _dy=0);
void fbNoCheck(bool noCheck) { fb_no_check = noCheck; } void fbNoCheck(bool noCheck) { fb_no_check = noCheck; }
void doPaintMuteIcon(bool mode) { do_paint_mute_icon = mode; } void doPaintMuteIcon(bool mode) { do_paint_mute_icon = mode; }
/* blit() is unnecessary, but here to avoid patches to the neutrino code */
void blit(void) {}
}; };
#endif #endif

View File

@@ -50,6 +50,8 @@
#include <daemonc/remotecontrol.h> #include <daemonc/remotecontrol.h>
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
/* we get edvbstring.h included via from src/system/settings.h */
#if 0
/* from edvbstring.cpp */ /* from edvbstring.cpp */
static bool isUTF8(const std::string &string) static bool isUTF8(const std::string &string)
{ {
@@ -81,6 +83,7 @@ static bool isUTF8(const std::string &string)
} }
return true; // can be UTF8 (or pure ASCII, at least no non-UTF-8 8bit characters) return true; // can be UTF8 (or pure ASCII, at least no non-UTF-8 8bit characters)
} }
#endif
CLCD::CLCD() CLCD::CLCD()
{ {