Multi-prefix FJOIN, and allowing module-defined prefixes across the network

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

diff --git a/include/typedefs.h b/include/typedefs.h
index 1cd48a24aeffd2770a4489e84b3b0668675eb099..fc99fd435832bb91b8c31000709e1f8195a545ce 100644 (file)
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -1,28 +1,21 @@
 #ifndef __TYPEDEF_H__
 #define __TYPEDEF_H__
 
+#include <string>
+#include "inspircd_config.h"
+#include "hash_map.h"
 #include "users.h"
 #include "channels.h"
 #include "hashcomp.h"
 #include "inspstring.h"
 #include "ctables.h"
-#include "inspircd.h"
 #include "modules.h"
-#include "inspircd_config.h"
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
+#include "globals.h"
 
 typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
 typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
-typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp> address_cache;
-typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp> whowas_hash;
-typedef std::deque<command_t> command_table;
+
 typedef std::vector<std::string> servernamelist;
-typedef std::vector<ExtMode> ExtModeList;
-typedef ExtModeList::iterator ExtModeListIter;
+typedef std::deque<std::string> file_cache;
 
 #endif