diff --git a/Modules.cpp b/Modules.cpp index b4baaad2..e24a39ce 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -6,6 +6,10 @@ #include "Nick.h" #include "Chan.h" +#ifndef _MODDIR_ +#define _MODDIR_ "/usr/share/znc" +#endif + /////////////////// Timer /////////////////// CTimer::CTimer(CModule* pModule, unsigned int uInterval, unsigned int uCycles, const CString& sLabel, const CString& sDescription) : CCron() { SetName(sLabel); diff --git a/Modules.h b/Modules.h index 2e14fbb5..b83277bb 100644 --- a/Modules.h +++ b/Modules.h @@ -6,7 +6,6 @@ #include using std::vector; -#define VERSION 0.034 #define MODULEDEFS(CLASS) extern "C" { CModule* Load(void* p, CUser* pUser, const CString& sModName); void Unload(CModule* pMod); double GetVersion(); } double GetVersion() { return VERSION; } CModule* Load(void* p, CUser* pUser, const CString& sModName) { return new CLASS(p, pUser, sModName); } void Unload(CModule* pMod) { if (pMod) { delete pMod; } } #define MODCONSTRUCTOR(CLASS) CLASS(void *pDLL, CUser* pUser, const CString& sModName) : CModule(pDLL, pUser, sModName) diff --git a/User.h b/User.h index 517a36c1..806dce34 100644 --- a/User.h +++ b/User.h @@ -1,6 +1,7 @@ #ifndef _USER_H #define _USER_H +#include "main.h" #ifdef _MODULES #include "Modules.h" #endif diff --git a/main.h b/main.h index e7c68e15..e26241d6 100644 --- a/main.h +++ b/main.h @@ -2,6 +2,8 @@ #define _MAIN_H +#define VERSION 0.034 + #ifndef CS_STRING #define CS_STRING CString #endif diff --git a/znc.cpp b/znc.cpp index 6f590f44..2efc18e3 100644 --- a/znc.cpp +++ b/znc.cpp @@ -308,6 +308,7 @@ bool CZNC::WriteNewConfig(const CString& sConfig) { vsLines.push_back("\tChanModes = " + sAnswer); } +#ifdef _MODULES set ssMods; CModules::GetAvailableMods(ssMods, this); @@ -332,6 +333,7 @@ bool CZNC::WriteNewConfig(const CString& sConfig) { } } } +#endif vsLines.push_back(""); CUtils::PrintMessage("");