X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=3993142c706bdf07014d1ce0d5a059ddc5653151;hb=1200d6285b1d64699c6fa2c8241e2ee40f52d2a3;hp=09bf02ba5a4d4869ff53dc5a51f2badbb3b25f0b;hpb=edd35ae3af70075e0d59b6409f6d206c6c08d85b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index 09bf02ba5..3993142c7 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -45,7 +45,7 @@
 #include <deque>
 #include <map>
 #include <bitset>
-
+#include <set>
 
 /** A list of failed port bindings, used for informational purposes on startup */
 typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
@@ -66,7 +66,6 @@ typedef std::vector< KeyVal > KeyValList;
  */
 typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
-
 #include "inspircd_config.h"
 #include "numerics.h"
 #include "uid.h"
@@ -277,13 +276,16 @@ DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 class XLineManager;
 class BanCacheManager;
 
+/** The background thread for config reading, so that reading from executable includes
+ * does not block.
+ */
 class CoreExport ConfigReaderThread : public Thread
 {
 	InspIRCd* ServerInstance;
 	bool do_bail;
-	User* TheUser;
+	std::string TheUserUID;
  public:
-	ConfigReaderThread(InspIRCd* Instance, bool bail, User* user) : Thread(), ServerInstance(Instance), do_bail(bail), TheUser(user)
+	ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid) : Thread(), ServerInstance(Instance), do_bail(bail), TheUserUID(useruid)
 	{
 	}
 
@@ -448,7 +450,7 @@ class CoreExport InspIRCd : public classbase
 
 	/** Mutex engine, handles mutexes for threading where required
 	 */
-	MutexEngine* Mutexes;
+	MutexFactory* Mutexes;
 
 	/** The thread/class used to read config files in REHASH and on startup
 	 */