From 76ec1833ba62798c671935014a10677f514ffc0a Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Wed, 9 May 2012 14:45:29 +0200 Subject: fix compile --- Makefile | 2 +- eepg.c | 4 ++-- log.h | 6 +++--- setupeepg.c | 2 +- setupeepg.h | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 0bebc82..a2d413e 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ### The object files (add further files here): -OBJS = $(PLUGIN).o dish.o epghandler.o +OBJS = $(PLUGIN).o dish.o epghandler.o setupeepg.o ifdef DBG CXXFLAGS += -g diff --git a/eepg.c b/eepg.c index 042180d..902c271 100644 --- a/eepg.c +++ b/eepg.c @@ -4548,9 +4548,9 @@ bool cPluginEEPG::SetupParse (const char *Name, const char *Value) SetupPE->DisplayMessage = atoi (Value); #ifdef DEBUG else if (!strcasecmp (Name, "LogLevel")) - SetupPE.LogLevel = atoi (Value); + SetupPE->LogLevel = atoi (Value); else if (!strcasecmp (Name, "ProcessEIT")) - SetupPE.ProcessEIT = atoi (Value); + SetupPE->ProcessEIT = atoi (Value); #endif else return false; diff --git a/log.h b/log.h index 1a0e88f..35942d3 100644 --- a/log.h +++ b/log.h @@ -17,7 +17,7 @@ /* all is logged into /var/log/syslog */ -bool CheckLevel(int level) +inline bool CheckLevel(int level) { #ifdef DEBUG if (cSetupEEPG::getInstance()->LogLevel >= level) @@ -30,7 +30,7 @@ bool CheckLevel(int level) return false; } -const char* PrepareLog(std::string message) +inline const char* PrepareLog(std::string message) { message = "EEPG: " + message; return message.c_str(); @@ -39,7 +39,7 @@ const char* PrepareLog(std::string message) #define MAXSYSLOGBUF 256 //void LogVsyslog(int errLevel, const char * message, ...) -void LogVsyslog(int errLevel, int const& lineNum, const char * function, const char * message, ...) +inline void LogVsyslog(int errLevel, int const& lineNum, const char * function, const char * message, ...) { va_list ap; char fmt[MAXSYSLOGBUF]; diff --git a/setupeepg.c b/setupeepg.c index 4d9471e..3738227 100644 --- a/setupeepg.c +++ b/setupeepg.c @@ -26,7 +26,7 @@ cSetupEEPG::cSetupEEPG (void) } -static cSetupEEPG* cSetupEEPG::getInstance() +cSetupEEPG* cSetupEEPG::getInstance() { if (!_setupEEPG) _setupEEPG = new cSetupEEPG(); diff --git a/setupeepg.h b/setupeepg.h index ef1ad2a..f5e342a 100644 --- a/setupeepg.h +++ b/setupeepg.h @@ -26,8 +26,8 @@ public: private: cSetupEEPG (void); - cSetupEEPG(cSetupEEPG const&){}; // copy constructor is private - cSetupEEPG& operator=(cSetupEEPG const&){}; // assignment operator is private + cSetupEEPG(cSetupEEPG const&); // copy constructor is private + cSetupEEPG& operator=(cSetupEEPG const&); // assignment operator is private static cSetupEEPG* _setupEEPG; }; -- cgit v1.2.3