X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Ftypedefs.h;h=cd8c820397a57a4cab330095c632def9a39e43c9;hb=40320969da824c4150134fa5177c02694c6b49bd;hp=1cd48a24aeffd2770a4489e84b3b0668675eb099;hpb=7a17273ec03afb3f5caa0e4b6fe3473cf09711d4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/typedefs.h b/include/typedefs.h
index 1cd48a24a..cd8c82039 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -1,6 +1,9 @@
 #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"
@@ -8,21 +11,14 @@
 #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