Remove the -Dssize_t declaration now its typedeffed.

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

diff --git a/include/typedefs.h b/include/typedefs.h
index ca3efcc7018405dcc2f59f0d088482089eed9c03..fa4477f84918919ede712f91b8a8521f613f8493 100644 (file)
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -14,8 +14,10 @@
 #ifndef __TYPEDEF_H__
 #define __TYPEDEF_H__
 
-#ifndef WIN32
-
+#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
+       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;
+#else
        #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;
@@ -23,16 +25,8 @@
                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
-
-       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
 
-/** Server name cache
- */
-typedef std::vector<std::string*> servernamelist;
-
 /** A cached text file stored line by line.
  */
 typedef std::deque<std::string> file_cache;