Move file inclusion logic into calcdep, and complain about ambiguous #include directi...

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index 66134e3bc5f3d5efbb75c1662914fc8b5a09a573..ab8ff37d4d693aee4b3c131c9ee175cefd79d2fd 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -159,7 +159,7 @@ void                Module::OnGlobalOper(User*) { }
 void           Module::OnPostConnect(User*) { }
 int            Module::OnAddBan(User*, Channel*, const std::string &) { return 0; }
 int            Module::OnDelBan(User*, Channel*, const std::string &) { return 0; }
-void           Module::OnRawSocketAccept(int, const std::string&, int) { }
+void           Module::OnRawSocketAccept(int, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { }
 int            Module::OnRawSocketWrite(int, const char*, int) { return 0; }
 void           Module::OnRawSocketClose(int) { }
 void           Module::OnRawSocketConnect(int) { }
@@ -197,7 +197,7 @@ void                Module::OnText(User*, void*, int, const std::string&, char, CUList&) { }
 void           Module::OnRunTestSuite() { }
 void           Module::OnNamesListItem(User*, User*, Channel*, std::string&, std::string&) { }
 int            Module::OnNumeric(User*, unsigned int, const std::string&) { return 0; }
-void           Module::OnHookUserIO(User*, const std::string&) { }
+void           Module::OnHookUserIO(User*) { }
 bool           Module::OnHostCycle(User* user) { return false; }
 
 ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
@@ -379,7 +379,7 @@ bool ModuleManager::Load(const char* filename)
        if (strchr(filename,'*') || (strchr(filename,'?')))
        {
                int n_match = 0;
-               DIR* library = opendir(Instance->Config->ModPath);
+               DIR* library = opendir(Instance->Config->ModPath.c_str());
                if (library)
                {
                        /* Try and locate and load all modules matching the pattern */
@@ -402,7 +402,7 @@ bool ModuleManager::Load(const char* filename)
        }
 
        char modfile[MAXBUF];
-       snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename);
+       snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath.c_str(),filename);
        std::string filename_str = filename;
 
        if (!ServerConfig::FileExists(modfile))