X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Ftypedefs.h;h=5caebf0f12276c1c433643b57628bdbd5e135225;hb=4d03a38661cb7fa6a0880b66bbebf1d892ba5013;hp=1bb65bebebb192e630a3a2f32b4b2da0897587f1;hpb=1e639377cbad496a0b5f7d969a88fb808508f811;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/typedefs.h b/include/typedefs.h
index 1bb65bebe..5caebf0f1 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -1,28 +1,41 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #ifndef __TYPEDEF_H__
 #define __TYPEDEF_H__
 
-#include "users.h"
-#include "channels.h"
-#include "hashcomp.h"
-#include "inspstring.h"
-#include "ctables.h"
-#include "inspircd.h"
-#include "modules.h"
-#include "globals.h"
-#include "inspircd_config.h"
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
+#ifndef WIN32
+
+	#ifdef HASHMAP_DEPRECATED
+		typedef nspace::hash_map<std::string, User*, nspace::insensitive, irc::StrHashComp> user_hash;
+		typedef nspace::hash_map<std::string, Channel*, nspace::insensitive, irc::StrHashComp> chan_hash;
+	#else
+		typedef nspace::hash_map<std::string, User*, nspace::hash<std::string>, irc::StrHashComp> user_hash;
+		typedef nspace::hash_map<std::string, Channel*, nspace::hash<std::string>, irc::StrHashComp> chan_hash;
+	#endif
 #else
-#include <hash_map>
+
+	typedef nspace::hash_map<std::string, User*, nspace::hash_compare<std::string, std::less<std::string> > > user_hash;
+	typedef nspace::hash_map<std::string, Channel*, nspace::hash_compare<std::string, std::less<std::string> > > chan_hash;
 #endif
 
-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;
+/** Server name cache
+ */
+typedef std::vector<std::string*> servernamelist;
 
-typedef std::vector<std::string> servernamelist;
-typedef std::vector<ExtMode> ExtModeList;
-typedef ExtModeList::iterator ExtModeListIter;
+/** A cached text file stored line by line.
+ */
 typedef std::deque<std::string> file_cache;
 
 #endif
+