Routing more socket includes through socket.h

[user/henk/code/inspircd.git] / include / modules.h

diff --git a/include/modules.h b/include/modules.h
index 88d4eecdf89d9b25978c949d148d154e962b79d7..f15341e017baa3c53e2a2fb6addfd5f140a24f2b 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -64,10 +64,11 @@ enum TargetTypeFlags {
        TYPE_OTHER
 };
 
+#include "globals.h"
 #include "dynamic.h"
 #include "base.h"
 #include "ctables.h"
-#include "socket.h"
+#include "inspsocket.h"
 #include <string>
 #include <deque>
 #include <sstream>
@@ -101,7 +102,7 @@ typedef std::deque<userrec*> chanuserlist;
                } \
                catch (ModuleException& modexcept) \
                { \
-                       log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+                       log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); \
                } \
        } \
   }
@@ -1778,10 +1779,11 @@ class ConfigReader : public classbase
         * core is changed). It will contain a pointer to the configuration file data with unneeded data
         * (such as comments) stripped from it.
         */
-       std::stringstream *cache;
-       std::stringstream *errorlog;
+       ConfigDataHash* data;
+       std::ostringstream* errorlog;;
        /** Used to store errors
         */
+       bool privatehash; // If we're using our own config data hash or not.
        bool readerror;
        long error;
        
@@ -1930,6 +1932,8 @@ class ModuleFactory : public classbase
 
 
 typedef DLLFactory<ModuleFactory> ircd_module;
+typedef std::vector<Module*> ModuleList;
+typedef std::vector<ircd_module*> FactoryList;
 
 bool ModeDefined(char c, int i);
 bool ModeDefinedOper(char c, int i);