Windows compile fixes for RLine

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 550baa027d2c4e34500e16d51af887a2656c383b..463f9d82fdcbc130a85131d0005c4aa61c79b84f 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -48,10 +48,6 @@
 #include "caller.h"
 #include "testsuite.h"
 
-using irc::sockets::insp_ntoa;
-using irc::sockets::insp_inaddr;
-using irc::sockets::insp_sockaddr;
-
 InspIRCd* SI = NULL;
 int* mysig = NULL;
 
@@ -78,12 +74,9 @@ const char* ExitCodes[] =
                "Could not create windows forked process", /* 14 */
                "Received SIGTERM", /* 15 */
                "Bad command handler loaded", /* 16 */
-               "Windows service specific error 1", /* 17 - Dont know what to call these yet, will give them */
-               "Windows service specific error 2", /* 18 - better descriptions later on */
-               "Windows service specific error 3", /* 19 */
-               "Windows service specific error 4", /* 20 */
-               "Windows service specific error 5", /* 21 */
-               "Windows service specific error 6"  /* 22 */
+               "RegisterServiceCtrlHandler failed", /* 17 */
+               "UpdateSCMStatus failed", /* 18 */
+               "CreateEvent failed" /* 19 */
 };
 
 void InspIRCd::Cleanup()
@@ -461,6 +454,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        ThreadEngineFactory* tef = new ThreadEngineFactory();
        this->Threads = tef->Create(this);
        delete tef;
+       this->Mutexes = new MutexFactory(this);
 
        /* Default implementation does nothing */
        this->PI = new ProtocolInterface(this);
@@ -628,7 +622,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        /* During startup we don't actually initialize this
         * in the thread engine.
         */
-       this->ConfigThread = new ConfigReaderThread(this, true, NULL);
+       this->ConfigThread = new ConfigReaderThread(this, true, "");
        ConfigThread->Run();
        delete ConfigThread;
        this->ConfigThread = NULL;
@@ -780,7 +774,8 @@ int InspIRCd::Run()
                        this->Res->Rehash();
                        this->ResetMaxBans();
                        InitializeDisabledCommands(Config->DisabledCommands, this);
-                       FOREACH_MOD_I(this, I_OnRehash, OnRehash(Config->RehashUser, Config->RehashParameter));
+                       User* user = !Config->RehashUserUID.empty() ? FindNick(Config->RehashUserUID) : NULL;
+                       FOREACH_MOD_I(this, I_OnRehash, OnRehash(user, Config->RehashParameter));
                        this->BuildISupport();
                }